Cannot reintegrate into mixed revision working copy try updating first
Changes that occurred in the past to trunk are now showing up again in the merge, and SVN (and CVS) get very confused. Look at the picture: Example Branch/Merge and Remerge. w=300" data-large-file="https://designbygravity.files.wordpress.com/2009/10/svn-problem1x6001.png? w=448&h=177 448w, https://designbygravity.files.wordpress.com/2009/10/svn-problem1x6001.png? w=150&h=59 150w, https://designbygravity.files.wordpress.com/2009/10/svn-problem1x6001.png? w=300&h=119 300w, https://designbygravity.files.wordpress.com/2009/10/svn-problem1x6001600w" sizes="(max-width: 450px) 100vw, 450px" /in which the modifications took place. So the order the merge tries to resolve is T1, T0, T4, T3.
" data-medium-file="https://designbygravity.files.wordpress.com/2009/10/svn-problem1x6001.png? But it is more awkward than that, because T0 and T4 are already committed to trunk, really it looks like you are applying T0, T4, T1, T3. But since changes are in terms of the previous state of the file being changed, T3’s modifications knew nothing about T4’s modifications, so you are applying modifications out of order, and things go boom. First of all, instead of one branch, we have three. Branching in SVN is fast enough not to care (in CVS though, ouch).
It sounds like you mainly want the sync and reintegrate merges as explained in remember which direction you're merging in.
If merging from trunk to a branch, use the "sync" type merge.
If you stick to that there should be no spurious conflicts.
Well, if what you've committed now is your desired merge result, then that's fine.
This won't haunt you forever if you start using the proper merge commands in the future.
darthcamaro writes "Remember back in the day when we all used CVS?
Then we moved to SVN (subversion) but in the last three yrs or so everyone and their brother seems to have moved to Git, right?
Well truth is Subversion is still going strong and just released version 1.8.