Cannot reintegrate into mixed revision working copy try updating first punk rock dating game tritone
Instead, you and Sally might continue to share changes as you work.
It's up to you to decide which changes are worth sharing; Subversion gives you the ability to selectively changes between branches.
In more common speak, a changeset is just a patch with a name you can refer to.
In Subversion, a global revision number Continuing with our running example, let's suppose that a week has passed since you started working on your private branch.
I've tried using --force, but that seems to work once, but subsequently the merge will still fail with the same error.
I've resorted to explicitly updating my external to the same revision as the rest of the WC before merge proceeds.
Whenever someone needs to make a long-running change that is likely to disrupt the trunk, a standard procedure is to create a private branch and commit changes there until all the work is complete.Is there a cleaner way around this or am I doing something wrong?Now you and Sally are working on parallel branches of the project: you're working on a private branch, and Sally is working on the trunk, or main line of development.So, the good news is that you and Sally aren't interfering with each other.The bad news is that it's very easy to drift strategy is that by the time you're finished with your branch, it may be near-impossible to merge your changes back into the trunk without a huge number of conflicts.