I was merging using Visual Studio Code when I realised I wanted to merge neither the current nor the incoming code. I wanted it both gone. And that option does not exist!
Only accept one, the other, or both.
T'was a mildy interesting experience.

  • 2
    Thats more of a git thing in general, not jus vs code
  • 1
    Just delete both and move on
  • 0
    @C0D4 Dangit son. It's just text. Of course I deleted both and moved on. I just got surprised with a scenario that is so unusual it's not even in the auto merge options even though it's the only one missing.
  • 0
    Sometimes we just want it all to go away. I understand.
  • 0
    That's not really a merge then.
  • 0
    @electrineer Huh. I wonder what that was then.

    Branch A reacts to an event which does not exist in Branch B and branch B reacts to an event which does not exist in Branch A.
    Both events were removed on merge.
    Both events handlers were inside the same method and were marked as conflicting.
    Since both events no longer exist, I do not need those 2 handlers.
    Bum -> git checkout --none.
Add Comment