Merge makes conflicts when done via GUI

Hello,

TortoiseSVN is a very handy tool which makes working with SVN very easy, in my mind. But in the last few weeks I noticed some problems with merging. I always got conflicts and tree conflicts when mergin around.

We have a trunk and a permanent development branch, where changes are made some times in both directions.
To bring changes from trunk to the branch we call "merge a range of revisions" (with default settings) from the development branch's working copy and specify the trunk's URL in the "From" field.
To bring the changes made in the development branches to the trunk we use "Reintegrate a branch" (also with default settings) from the trunk's working directory and specify the development branch's URL in the "From" field.

I hope there's nothing wrong with this practice. In fact I've been doing so with other projects for years (mostly C#). But the problems now started in a PHP project.

Things are different when I use the command line tool (all Windows, by the way):

svn merge [URL, from where the changes should be taken from]

It's that easy, but I'm nonetheless worried that I can use TortoiseSVN only under the risk of messing the whole project up!
Am I doing something wrong, even though it has been working all the time for other projects?

Thank you very much in advance!

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-22 13:50:20 CEST