Trying to do a merge from a branch back into the trunk. Both projects are “clean.”
When I click the final “Finish” button in the Merge Wizard it churns for a bit (SVN window “Merging – please wait…”) and then it goes back to the Merge Wizard without anything in the underlying Pending changes window. I can click finish over and over and see no change.
I was expecting the changes from my branch to now be updates to my trunk – or at least SOMETHING to happen, but I can’t find anything that has happened.
Is there somewhere else to look for an error/status update that I’m missing?
The error listed in your “answer” means that you should merge 7-41 from trunk to the branch before reintegrating. Your branch should contain all changes from trunk before you can reintegrate it