On 28/03/2011 11:33, John Dexter wrote:
> On 28 March 2011 12:25, John Dexter <jdxsolutions_at_googlemail.com
> <mailto:jdxsolutions_at_googlemail.com>> wrote:
>
> The situation is:
>
> 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!
>
> 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.
>
> Thanks,
> John.
>
>
> In addition, I get genuine conflicts reported on files that have gone
> through the same process. Meaning Tortoise is downloading 100Mb+ of art
> resources it things are different, when all that's in the branch are a
> few little changes to code files
You are most certainly doing it wrong.
Please read:
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.commonpatterns.feature
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.advanced.blockchanges
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.branchmerge.cherrypicking
How did you "merge the branch into trunk"?
Andreas
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2714732
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-03-28 13:36:50 CEST