44 secondsGitComet in 44 Seconds
Open repositories and worktrees as tabs, find a commit, review its changes and make a focused commit. This short tour follows an everyday Git workflow in GitComet.
GitComet in action · 40 seconds
Merge Conflicts, Solved
Resolve a Git merge with two conflicted files. GitComet handles the unambiguous conflicts, then lets you choose a side or keep both changes before committing the result.
Watch on YouTube ↗ Download MP4 Watch the playlist on YouTube ↗
Follow along
Steps shown in the video
Recorded on Linux. The shortcuts below match the recording.
- Merge the feature branch into main. GitComet shows the files that still contain conflicts.
- Open the first file. Its unambiguous conflicts are already resolved; review the output, then save and stage it.
- Open the remaining conflicted file. Review the base, local and remote versions alongside the resolved output.
- Press C to take the remote side for the current conflict. Press Shift+F3 to move to the next conflict, then D to keep both sides.
- Review the combined result, save and stage the file, and commit the merge.
Keep exploring
44 seconds
43 secondsPick the Fix, Leave the Rest
Bring one fix from a feature branch onto main without merging the rest of the branch. Then squash two unpushed commits into a single commit before pushing.
32 secondsBorrow Changes, Commit Later
Apply selected files from another branch without bringing over its commits. GitComet stages the chosen changes on your current branch so you can review them before creating a commit.