On Tue, 10 Jul 2007, Graham Bloice wrote:
> In all the subsequent testing I've done, TortoiseMerge removed the conflict
> markers from the file. However, the user in question managed to commit with
> them still in place.
Interesting. I guess I haven't used TortoiseMerge enough - what
does it do when it removes the markers? ie. it leaves both sets of
changes in, just takes one? It doesn't seem like it could do the right
thing there. I thought "mark as resolved" ran "svn resolved" on the file,
which means it does absolutely nothing to the file in question, just
changes its status, and removes the extra files.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jul 10 21:18:27 2007