Terminology for referring to branches during merges and conflicts (was: [RFC] How to better assist users in resolving conflicts)

[Brian de Alwis]

On 13-Jan-2010, at 8:25 PM, Ben Finney wrote:
> 

> OTOH, the “mine”/“theirs” terminology is needlessly distracting to me.
> Often there is no “mine”/“theirs” distinction; they're both mine, or
> they're both someone else's. So the terms aren't helpful in numerous
> cases, and I think it should be deprecated.

I completely agree — it caused me some initial grief to figure out which was which.  I'd prefer something indicating the source of the versions like "TREE" and "MERGE", or "LOCAL" / "OTHER".

Brian.

--
On bike helmets: "If you think your hair is more important than your brain, you're probably right."  (B. J. Wawrykow)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3901 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100114/2d553ab2/attachment.bin