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
- Go to terminal and
git rebase master - When conflict occurs, I open Atom, resolve conflict and stage the file
- I come back to terminal and
git rebase --continue
Latest comments (35)
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.
My favorite tools are TortoiseGit + Beyond Compare, but TortoiseGit only works on Windows. On Mac I use SourceTree with Beyond Compare as well.
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 /:
I shout at people to stop them working on my files. π Just kidding.
Been there. Done that. No regrets πΉ
Same, but replace Atom with Code π€
Wasn't Vs a fork of Vs in the early days?
Emacs + Magit, It's a really great tool even if you're and experienced git user
Same here. Especially magit's interactive rebase makes rebasing so painless it always went flawlessly for me.
Are you using gitlens in VSCode ? It helps a lot on the normal git flow (including merges)
+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. :)
+1 for gitlens
It has a learning curve, but once you invest the time, it's worth the savings.
Wait!!! Wait!!! Wait!!!
Guys, use smartgit, especially during merge and rebase.
magit (with evil-magit plugin)
It is, hands down, the best git UI/UX I've experienced. Advanced git operations become simple and obvious.
Beyond Compare is the best tool I know for handling 3-way-merge.
I also use Fork and GitExtensions.