svn-merge

How are you using svnmerge for merging and branching in svn? Specifically I ask because I have started using svnmerge to track a specific branch in a project I work on. I did svnmerge merge and ended up with lots of strange files like .merge-left , .merge-right , .working . Now, I want to see how others use it to end up learning how I can revert my changes and apply a merge the best proper way. the_mandrill If you are seing the merge-left/right/working files then it means that there's been a conflict in a merge you've tried to apply. This means that the same section of code has been changed in

We have several large subprojects inside our main SVN project root. I commit and merge only my subproject when working with our release branches, mainly because it's faster. However, a colleague pointed out this reference to merging subdirectories in Version Control with Subversion (a.k.a "The SVN Book"): For long-lived release branches (as described in the section called “Common Branching Patterns” ), perform merges only on the root of the branch, not on subdirectories. Unfortunately, this is the extent of the warning. The linked section does not give an explanation either. Is committing and

I'm very new to Subversion, but I've used other revision control systems like ClearCase for years. My boss asked me to fix this project so that it could be built with Maven instead of Ant. One of the important things I had to do to was to move src/com to src/main/java/com , and move test/com to src/test/java/com , which I did using the svn mv command. I foolishly assumed that since I used Subversion commands to move the directories, that Subversion would then know that things had been moved. And when I merged my branch into the trunk, it appeared to work. But now somebody else just finished