Answer the question
In order to leave comments, you need to log in
What is the best choice for switching between commits?
What is the best choice for switching between commits?
Answer the question
In order to leave comments, you need to log in
If you click "Merge", a three-pane window will open - I personally find it inconvenient to work with it. So I usually select "Theirs" and then through the more familiar two-pane diff (with history, previous commit, or whatever) I review and apply the edits.
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question