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

[Gordon Tyler]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/14/2010 5:23 AM, Vincent Ladeuil wrote:
>>>>>> "Ben" == Ben Finney <ben+bazaar at benfinney.id.au> writes:
> 
>     Ben> Ben Finney <ben+bazaar at benfinney.id.au> writes:
>     >> Martin Pool <mbp at canonical.com> writes:
>     >> 
>     >> > 2010/1/13 Vincent Ladeuil <v.ladeuil+lp at free.fr>:
>     >> > > I switch from this/other to mine/theirs as I thought it made them
>     >> > > more "personal". When I merge a branch into my current working
>     >> > > tree, I clearly know which is "mine" and from there I deduce what
>     >> > > is "theirs" without thinking about *who* is theirs :)
>     >> >
>     >> > ok
>     >> 
>     >> 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.
> 
> Note that it's used in 'bzr missing' too.
> 
>     Ben> I forgot the case where the terminology is pathological:
>     Ben> I often am dealing with a merge where “this” ==
>     Ben> “theirs”, and “other” == “mine”.  Yet the terms used by
>     Ben> Bazaar are opposite to that. 

I've never really been comfortable with these terms either maybe because
that's as primarily CVS user I avoided doing merges as much as possible.

However, a thought just occurred to me, why don't we use branch nicks?

Ciao,
Gordon
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJLTxqGAAoJEIrPJfWinA2uR3kH/juDWSFrGUvJ4nk3Ow5oF0/2
bc+8DYZ5m/M7NXZL/dA81TaMGOS6s4wGXzT1T9SJRuIChCWpCNCqk3WoQ8lxM9vi
MfmJtUwDznmMTsyIXFerN0cUjgFJyCbcCiEQ20tMx7owaDY1x4hRBlt0rLiIpYnm
qXAsItO3r0YEBIJwEZDdTcf+ei5V3COhgqcsq83VbaAbMqo6/GZoDfunfNJ4zv+5
JDTssMH2CNChIoNrMJrjqJ2GAMHf/DQy9V22qf/DqVtmH6ls1IpljUhPJEqiTj1P
Nb86CyI6FPePoM9bOL/uNu1KrRkHfOytfAylB2QkOJKza0gGEnw6L1oxGhjspMc=
=p4Al
-----END PGP SIGNATURE-----