[p4] terminology: "yours" and "theirs" in resolve

Eric Dew ericd at resilience.com
Tue Oct 23 10:27:05 PDT 2001

It's not always between local and depot.  The "yours/theirs" terms are 
used to describe
integration from branch A to branch B.


Schaible, Jörg wrote:

>>"Yes we know it's awful but we can't come up
>>with anything better.  If you do, please let
>>us know..."
>>So suggestions please....
>What about with "local file" and "depot file"?
>perforce-user mailing list  -  perforce-user at perforce.com

More information about the perforce-user mailing list