You might consider a series of steps to perform the merge. Some of the steps might include:
1. Merge from master to branch one so that the diffs between branch one and master are only changes on branch one, test the resulting merge. Review and understand the remaining differences between master and branch one 2. Merge from master to branch two so that the diffs between branch two and master are only changes on branch two, test the resulting merge. Review and understand the remaining differences between master and branch two 3. Merge from branch one to master, test the resulting merge. This resolves branch one into master 4. Merge from master to branch two, test the resulting merge 5. Merge from branch two to master, test the resulting merge. This resolves branch two into master Mark Waite On Tue, Jul 25, 2017 at 6:38 AM JNickVA <manassasma...@gmail.com> wrote: > I have recently been put in charge of a code repository that contains a > MASTER and several branches. My task is to try to merge the root and the > top two most frequently used branches into a new repository. I face two > problems: the branches have not been merged to the root in a long time, and > the root is the code for a production website. I am looking for a useful > strategy for merging the branches into the root, or MASTER, branch. > > *Branch One* > <https://stackoverflow.com/documentation/review/changes/150671#> > This branch is 7 commits ahead, 35 commits behind master. > > > - > *Branch Two* > <https://stackoverflow.com/documentation/review/changes/150671#> > <https://stackoverflow.com/documentation/review/changes/150671#> > This branch is 760 commits ahead, 7 commits behind master. > > > One of the branches I wish to merge to the existing root is 7 commits > ahead, 35 commits behind master. The other branch is 760 commits ahead, 7 > commits behind master. What I'm looking for is a strategy for performing > the merge. There are no meaningful tags on any of the existing branches. > > Thanks > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to git-users+unsubscr...@googlegroups.com. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
