RE: Masses and masses of tree-conflicts

> 1. I made changes in /trunk which were committed  - fine
> 2. I merged these changes into a branch and committed them to the
> branch - fine
> 3. I merge the branch into trunk - suddenly loads of the files in
> question show as tree-conflicted
> I'm seeing tens or hundreds of them, not folders but individual
> files. I don't know if it's a Tortoise issue or SVN itself but it's
> really annoying and also reduces my trust in SVN not to do
> something horrible to my important files!

Nothing happens to your files unless you do a commit. You can also go back to previous revisions. SVN isn't going to do anything horrible to your files... it's only going to do what you tell it to do.

>
> So any help understanding what it means, why it happens is
> welcome... and of course advice on how to deal with it or stop it
> happening.

Is step 3 a reintegration merge?

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-28 16:20:35 CEST