"mine" resolution

Hi all,

There were a few conflicts when I committed my latest code (Unity C#) to our repository, so I ended up with some extra versions of each of those conflicts, which looked distracting in my Unity project panel.

I resolved them using the TortoiseSVN's "mine" resolution (was my first time learning about this...) in the hope of getting rid of those files in my working copy, but now I have one more of each conflict file! the "mine" files...

Of course I can always choose to hide them in my Explorer, but I wonder if there is a way to remove them from my working copy now that the SVN client knows mine was the correct one and matters are now resolved.

I would appreciate an answer, as well as bits of knowledge to consolidate my understanding of the mechanism(s) involved here.

Many thanks,

/>H

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3092131

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-02 18:17:00 CET