-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Steve Williams wrote:
> Tracy R Reed wrote:
>
>> I am occasionally seeing strange corruption in my checked out code
>> consisting of things like:
>
> That's what Subversion does to a file when there is a merge conflict.
Ahhhhhh! Thank you Steve and Branko! I have not had reports from my
users of having run into the conflict scenario and I thought it would
not let you check in the change until the conflict was resolved so I am
surprised to check out code and still have those marks in it. I will go
around and investigate how my users are handling this and make sure they
actually resolve the conflicts. Now it all makes sense. *PHEW* I thought
perhaps I had somehow seriously fouled up my companies most valuable
asset! :)
- --
Tracy R Reed
http://ultraviolet.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFC1fN29PIYKZYVAq0RAjcdAJ433ruKBQ7pn2UbdOaDlMpuewT2IACfWjD3
C79YvvdKEOB1ilpFVaCVFjE=
=hbXL
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 14 07:10:09 2005