DEV Community

Discussion on: What is your favourite git merge tool/strategy?

Collapse
yorodm profile image
Yoandy Rodriguez Martinez

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

Collapse
tailcall profile image
Anton Istomin

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