|
From: | Dustin Sallings |
Subject: | Re: [Gnu-arch-users] Yours/mine terminology. |
Date: | Wed, 24 Sep 2003 13:30:57 -0700 |
On Wednesday, Sep 24, 2003, at 12:46 US/Pacific, David Brown wrote:
I've learned from experience with Perforce that the terms yours and minecan 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.
I have to agree, this really confusing me in perforce. How about something more like this:
patch-n (the change that was submitted and conflicts) checked-out-version local-changes Something in that direction. -- Dustin Sallings
[Prev in Thread] | Current Thread | [Next in Thread] |