Re: [git-users] Git branch merge strategies

On 2017-07-25, at 5:38 AM, JNickVA 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

Re: [git-users] Git branch merge strategies

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

[git-users] Git branch merge strategies

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