I have always had a problem with the git merge “ours” “theirs” nomenclature because I can’t ever get it in my head which one is ours and which one is theirs and understandably, Sublime Merge carries it too. Can we get a memory aide added to help with which is which?
Since we’re almost always comparing them Left compared to Right, can we get a label or text that says something like:
| Left (theirs) | Right(ours) |
=====================
| code left | code right |
or a Take theirs(left), Take ours(right)
Surely, I can’t be the only one that can’t get this right and I would think it would be helpful.