svn
In subversion I made a branch now I want to merge it back into trunk. Which option should I use?
Reintegrate a branch
or
merge a range of revision
I was using Merge a range of revisions, but I was getting all sorts of tree conflict errors. Any idea what the difference is between these two?
I couldn't properly follow the other answers, here's more of a dummies guide...
You can do this either way round to go trunk -> branch or branch -> trunk. I always first do trunk -> branch fix any conflicts there and then merge branch -> trunk.
I found the solution reading the link that Gary gave (and I suggest to follow this way).
Summarizing to resolve the tree conflict committing your working directory with SVN client 1.6.x you can use:
svn resolve --accept working -R .
where . is the directory in conflict.
WARNING: "Committing your working directory" means that your sandbox structure will be the one you are committing, so if, for instance, you deleted some file from your sandbox they will be deleted from the repository too. This applies only to the conflicted directory.
In this way, we are suggesting SVN to resolve the conflict (--resolve), accepting the working copy inside your sandbox (--accept working), recursively (-R), starting from the current directory (.).
In TortoiseSVN, selecting "Resolved" on right click, actually resolves this issue.
Best Answer
When working with a branch, you should periodically merge ranges of revisions from the trunk into the branch to keep the branch in sync. if you don't pass any version numbers to svn merge and your svn server version is 1.5 or newer, it will track the merges you've previously done and automatically merge only newer revisions.
When the branch is finished, you should merge changes into it one last time, then reintegrate it back into the trunk.