Personally, I think for new users the wording of merge conflicts is confusing and at the very least inconsistent. Our/Theirs in the Resolve menu vs Upstream/Stashed in the diff. I think it’d be more useful to be more consistent with the language to avoid this confusion. For example, when I first saw the Resolve menu, I didn’t know that “Ours” was from the repo’s point of view. I thought it referred to my point of view, which was completely wrong. Hence my surprise resolving didn’t do the right thing.
