I am new to subversion. Over the past month, I made some changes and combined them with the trunk. Everything seemed beautiful - my changes spread, as expected. But today I reread the merge and saw this , saying the following when merging your changes back into trunk:
Now use svn merge with the --reintegrate option to replicate branch changes to the trunk again.
and a few paragraphs later:
Check out our use of the -reintegrate option this time. This option is critical for reintegrating changes from a branch back into the original development line - don't forget about it!
I guess I didn’t read things carefully enough for the first time.
So it seems I made a mistake with my previous merges back into the trunk, because I did not use the --reintegrate option. What are the consequences of this? Is there something I need to fix?
In case this is useful, my workflow looked like this:
- Copy from the trunk to create a personal branch.
- Check your personal thread.
- Changes and commits.
- Get a working copy of the chest.
- Drain my branch into a working copy of the trunk (again, without rebuild).
- Complete the merge.
- Delete branch.
source
share