What is your favourite git merge tool/strategy?

VSCode is my favourite editor. But while rebasing and resolving merge conflicts, I switch to Atom as their git integration is too damn good for resolving conflicts IMO. Just wondering what other tools/strategies devs use in general for resolving merge conflicts.

This is my usual flow

1. Go to terminal and git rebase master
2. When conflict occurs, I open Atom, resolve conflict and stage the file
3. I come back to terminal and git rebase --continue

Comments

[Darryl Norris]

This is the best way to merge in Git.

#### FYI: DO NOT RUN THESE COMMANDS. This will not merge instead it will force a pushed commit.

git add -f . && \ 
git commit -m "`curl -s http://whatthecommit.com/index.txt`" && \
git push -f

FYI: DO NOT RUN THESE COMMANDS. This will not merge instead it will force a pushed commit.

[Mihail Malo]

This is pretty bad, maybe copy the warning to above the code as well.

And into the code as a comment, for good measure.

[Darryl Norris]

Done

[Dinesh Pandiyan]

I see what you did there 🔥

[Darryl Norris]

hahahah

[Stephanie Handsteiner]

I do my git stuff via command line, idk I learnt git on the CLI, never used a GUI for it and I just sticked to that, I guess. :D

Sometimes I'll use Atom too, for repos being hosted on GitHub anyway.

[Dinesh Pandiyan]

I'm still the terminal guy. You don't need anything when you got oh-my-zosh right?

But how do resolve conflicts when you rebase?

I usually,

1. Go to terminal and git rebase master
2. When conflict occurs, I open atom, resolve conflict and stage the file
3. I come back to terminal and git rebase --continue

[Alexandru Bucur]

Are you using gitlens in VSCode ? It helps a lot on the normal git flow (including merges)

[Al Romano]

+1 for GitLens.

As Doruk says below it does have a bit of a learning curve but it's totally worth it.

I've uninstalled GitKraken now because of it.

Between the side-bar additions and the command palette items you should be able to git ninja your way out of most situations.

There is always Git in termial if you need to go full hacker mode. :)

[Doruk Kutlu]

+1 for gitlens

It has a learning curve, but once you invest the time, it's worth the savings.

[Joe Clay]

My current Git workflow is:

• VS Code's built-in Git support for check-ins and simple diffs
• Sourcetree for the more complex bits (managing merges, rebasing, squashing commits)
• P4Merge for resolving merge conflicts
  • I used to used Meld - the UI is a little nicer, but it's really slow to start up :(

[Dinesh Pandiyan]

VSCode's built in git isn't that great if you ask me. I like selective staging where I can stage/unstage particular line(s), which isn't supported by VSCode. Also, you cannot use keyboard in their staging area, which is very much bad experience for me.

Maybe we all should pool in and port the Atom's git integration to VSCode so we'll have the perfect editor of all time.

[Mahlon Gumbs]

You can stage/unstage particular lines with VSCode. I do it all the time. Only rule is that the lines must be consecutive.

[Adam Crockett 🌀]

Vs codes conflict resolver is also good, no need for another tool. Source tree to Vs code.

[Adarsh]

Check out Gitkraken it's a good GUI tool build for git. They support most of the git features and also make the merging and rebasing process very easy.

[Dinesh Pandiyan]

GitKraken is good as long as you only do reads (checkout and diff) and not writes (commits and rebase) 'coz they don't support local config or multiple config in their community edition which is kind of a bummer.

[John Costanzo]

Some time ago I used that tool. But when they switched their TOC to having to pay for it for non open source stuff, I left it

[Anthony Bouvier]

Same, and it started requiring an account be set up. For the desktop app. No thanks.

[Chad Smith]

I used to be a big fan of GitKraken, though on larger repositories it seem to just slow down to a crawl for me. It would just take forever for them to open. Sometimes spin forever.

I also tried to use with git LFS enabled and kept having issues with it sadly.

[EkaterinaS]

My favorite git merge tool is Code Compare
Code Compare can be integrated into a variety of version control systems that support external comparators. Code Compare extends VCS native comparison functionality with its advanced approach to file comparison and merging.

[Yoandy Rodriguez Martinez]

Emacs + Magit, It's a really great tool even if you're and experienced git user

[Maria Zaitseva]

Same here. Especially magit's interactive rebase makes rebasing so painless it always went flawlessly for me.

[Anthony Bouvier]

All from the command line. Close eyes. Try merge. Pray. :D

I'll have to check out some of the tools mentioned in rest of comments though. I think it is important to know how to do it from the CLI, but if you do know how to do that, I don't mind a tool as well.

[Dinesh Pandiyan]

I've been working on a feature branch for three weeks now that has around 50 new commits and rebase them every single day with master. So I totally relate with closing eyes and praying part :D

[Jonathan Boudreau]

If its a fairly complex merge conflict, I use the builtin three way merge in fugitive (vim plugin). I don't normally run into major merge conflicts though.

[Matthieu Vion]

GitKraken may be an electron app, it works very well merge, conflict resolving, the only downside is that it does not sign commits with GPG /: