Merge conflicts files that weren't modified
From: Denny Caldwell <dcaldwell_at_grinn.net>
Date: 2006-12-19 22:26:16 CET
(I'm pretty sure I had already posted this once, but it's been out there for
The software we develop can be highly customized at our client's request.
Let me precept my issue with my understanding of what a merge is. From what
Here's my scenario. This is all using Tortoise, mind you:
/branches/client1 created from trunk rev 5
/branches/client1 modified 5 files, rev 9
I get conflicts on 12 files, most of them which were not even modified in
I can only guess that it's because those files were modified during the
-- Denny Caldwell Grinn Productions www.grinn.netReceived on Tue Dec 19 22:27:06 2006
This is an archived mail posted to the Subversion Users mailing list.