![]() If you select all three revisions, or leave the revision specifier empty, this will happen. You want all three changes on the MayBranch–123, 124, and 125–to be merged into your AugustBranch. Both branches were copied from trunk revision 122. ![]() Consider a trunk with revision 122 a MayBranch with revisions 123, 124, and 125 and an AugustBranch with revisions 126 and 127. If you say "merge HEAD" you are not saying "merge all changes up through HEAD", you are saying "merge only the specific change that happened in the very last revision on that branch". When you do a "range of revisions" merge, you are picking individual CHANGES to cherry-pick over into your merge destination. You either need to select ALL the revisions in the branch whose changes are not yet included in your branch, or leave the range specifier empty to allow SVN to figure out which revisions to merge. ![]() If you select only HEAD, than any changes in any revisions prior to HEAD will not be included in the merge. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |