-1

When you have a merge conflict, what is your workflow?

ram1
  • 5,610
  • 6
  • 37
  • 43

1 Answers1

1

For diff purposes, I often use one of the scripts mentioned in the SO question "git difftool, open all diff files immediately, not in serial".

That way, I can see all the files diff'ed at once, avoiding flippping between files.

Community
  • 1
  • 1
VonC
  • 1,042,979
  • 435
  • 3,649
  • 4,283