16 messages in com.perforce.perforce-user[p4] terminology: "yours" and "theirs...
FromSent OnAttachments
Rick Macdonald22 Oct 2001 16:51 
Yariv Sheizaf23 Oct 2001 00:04 
Paul Goffin23 Oct 2001 00:54 
"Schaible, Jörg"23 Oct 2001 01:23 
Bert Lindgren23 Oct 2001 01:43 
Robert Cowham23 Oct 2001 02:07 
Robert Cowham23 Oct 2001 02:41 
wiv...@us.itmasters.com23 Oct 2001 06:59 
Rick Macdonald23 Oct 2001 07:50 
Rick Macdonald23 Oct 2001 09:01 
Dave Lewis23 Oct 2001 09:29 
Rick Macdonald23 Oct 2001 10:14 
Rick Macdonald23 Oct 2001 10:17 
Eric Dew23 Oct 2001 10:26 
Robert Cowham23 Oct 2001 10:49 
Dave Lewis23 Oct 2001 11:39 
Subject:[p4] terminology: "yours" and "theirs" in resolve
From:Eric Dew (eri@resilience.com)
Date:10/23/2001 10:26:43 AM
List:com.perforce.perforce-user

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

EDEW

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"?

J?rg

_______________________________________________ perforce-user mailing list - perforce-user at perforce.com http://maillist.perforce.com/mailman/listinfo/perforce-user