What are the differences between merging a range of revisions vs. reintegrate in SVN?

前端 未结 3 971
野性不改
野性不改 2020-11-30 04:01

I have read some documentation and blogs about the difference between merge a range of revisions and reintegrate but I didn\'t get one thing.

What is a difference in

3条回答
  •  旧巷少年郎
    2020-11-30 04:08

    reintegrate is meant to be used when you were working on a feature branch, and are done. The next step should be deleting the branch. Before reintegrating, you should merge the destination (most often trunk) to the branch using "range of revisions" merge to merge all eligible revisions to the branch. This is described slightly above the reintegrate paragraph.

    The "range of revisions" merge is meant for cherry picking revisions that should go to a certain branch, for example for fixing bugs in a stable release branch.

提交回复
热议问题