The SVN book states the following:
Once you have performed a reintegrate merge you should not continue to
use it for development. The reason for this is that if you try to
resynchronize your existing branch from trunk later on, merge tracking
will see your reintegration as a trunk change that has not yet been
merged into the branch, and will try to merge the branch-to-trunk
merge back into the branch! The solution to this is simply to create a
new branch from trunk to continue the next phase of your development.
In my case I want to keep using the branch after the reintegration to trunk and continue reintegrating to trunk multiple times. I have done this and I have run into two main problems:
- I keep getting weird tree conflicts when I try reintegrate.
- I keep getting a message that says something like "Reintegrate can only be used if revisions 280 through 325 were previously"
How do I get around this issue if I want to be able to reintegrate from a branch multiple times?
Best Answer
You can use the --record-only merge option as explained in SVN book, section Keeping a Reintegrated Branch Alive
Note that from Subversion 1.8, this is no longer needed, as automatic reintegration merge was introduced.