8 messages in com.perforce.perforce-userSuggestion for resolving| From | Sent On | Attachments |
|---|---|---|
| Cowham | 13 Oct 1998 09:48 | |
| Rich...@geodesic.com | 13 Oct 1998 10:15 | |
| Dave...@vignette.com | 13 Oct 1998 10:18 | |
| Ines...@llnl.gov | 13 Oct 1998 11:09 | |
| Brad...@email.mot.comBrad_Appleton-GBDA001 | 13 Oct 1998 11:26 | |
| Cowham | 14 Oct 1998 02:29 | |
| Jeff...@hotmail.com | 14 Oct 1998 08:36 | |
| Jerr...@esd.sgi.com | 14 Oct 1998 17:27 |
| Subject: | Suggestion for resolving![]() |
|---|---|
| From: | Dave...@vignette.com (Dave...@vignette.com) |
| Date: | 10/13/1998 10:18:49 AM |
| List: | com.perforce.perforce-user |
From: "Cowham, Robert (Associate)" <CowhamR at logica.com>
> Date: Tue, 13 Oct 1998 17:49:00 +0100 > X-Mailer: Internet Mail Service (5.0.1460.8) > Precedence: list > Errors-To: listman at perforce.com > X-Sequence: 1492 > > It has been pointed out to me that the current terminology for resolving > which refers to files as "yours" and "theirs" is very easy to confuse, > particularly if you use the -r flag. I must admit that most times I do this > I have the manual right beside me. > > Surely there are some less ambiguous terms relating to what is displayed on > the command prompt? > > Left and right would seem better to me, though the branch names would be > best if appropriate. > > Any other thoughts on this? > > Robert >
Well, I did have some thoughts, but then I realized that they are limited to the way I use it. Usually, my client does not encompass both branches, so "yours" easily referrs to my client at the time, no matter what -r or whatever.
dave




