2
donuts
5y

If I'm in a merge conflict and have the Diff Editor open (REMOTE, LOCAL) which file is the final copy that will be "saved"?

Comments
  • 0
    Am I supposed to merge into Local or Remote?
  • 1
    In a word, LOCAL. REMOTE is the "remote" branch that you're merging into your "local" copy.
Add Comment