[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: join not producing conflict
From: |
Derek Robert Price |
Subject: |
Re: join not producing conflict |
Date: |
Tue, 21 Oct 2003 13:58:08 -0400 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624 Netscape/7.1 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Paul Edwards wrote:
| The specific case I used it on unsuccessfully the other day was
|
|two people editing the same file in the same working directory.
|I saved my version first, committed it, then they saved theirs,
[snip]
Please reread my previous email.
Derek
- --
~ *8^)
Email: derek@ximbiot.com
Get CVS support at <http://ximbiot.com>!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org
iD8DBQE/lXOvLD1OTBfyMaQRAjBiAKD6+XUZtOHL/al5p9X/H1pj3yw2vACg+UVu
WbjbBHfOOtYf8ZmW6HyZYhM=
=2WFr
-----END PGP SIGNATURE-----
- Re: join not producing conflict, (continued)
- Message not available
- Re: join not producing conflict, Paul Edwards, 2003/10/21
- Re: join not producing conflict, Paul Edwards, 2003/10/21
- Re: join not producing conflict, Derek Robert Price, 2003/10/22
- Message not available
- Re: join not producing conflict, Paul Edwards, 2003/10/22
- Re: join not producing conflict, Mark D. Baushke, 2003/10/22
- Re: join not producing conflict, Derek Robert Price, 2003/10/24
- Message not available
- Re: join not producing conflict, Paul Edwards, 2003/10/22
- Message not available
- Re: join not producing conflict, Paul Edwards, 2003/10/21
- Re: join not producing conflict,
Derek Robert Price <=