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