Do all the things like ++ or -- rants, post your own rants, comment on others' rants and build your customized dev avatarSign Up
24th-Dragon216121dThats more of a git thing in general, not jus vs code
C0D45681821dJust delete both and move on
halfflat198621dSometimes we just want it all to go away. I understand.
That's not really a merge then.
@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.