DEV Community

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

Collapse
 
stephanie profile image
Stephanie Handsteiner • Edited

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.

Collapse
 
flexdinesh profile image
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