[Gnu-arch-users] Yours/mine terminology.

[David Brown]

On Wed, Sep 24, 2003 at 11:37:17AM -0700, Tom Lord wrote:

> Then the three trees are:
>      * older
>      * yours
>      * mine

I've learned from experience with Perforce that the terms yours and mine
can become misleading.  Perforce always uses them when merging, even
when yours and mine have the opposite intuitive meaning.

Think of the case where I'm merging my changes from my development
branch back to a mainline branch (I have write access there).  In this
case "mine" is the mainline, and "yours" are my changes.

For descriptions, they're probably fine, I would just hate to see them
end up in code.

Dave