Michael, 1. At this stage I am not sure that what is in production is represented by the master branch, and if it was at one time, when that might have been. 2. I am taking over the project from a group of developers who have been working remotely with little ort no supervision. I have 2 weeks to pick their brains. They have made commits without tags of any kind for over 6 months. 3. and 4. I don't even have enough information to know the state of the master when each of the 2 branches were created 5. My goal, as I stated in my post, is to try to resolve the differences between the master and branches in an orderly manner.
On Tuesday, July 25, 2017 at 6:47:23 PM UTC-4, Michael Gersten wrote: > > On 2017-07-25, at 5:38 AM, JNickVA <manass...@gmail.com <javascript:>> > 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 > > > So let me see if I understand this correctly: > > 1. Master is actual production code that is still in use. > 2. Both branches are in use by developers that you can talk to and > understand what they are doing. > 3. Branch 1 is a small patch to an older version of master. > 4. Branch 2 is a big patch to a recent version of master. > 5. Your goal is to ... what?!?!? > > Seriously, what is your goal? You have three different code-bases, with > three different programs. > > > > -- > 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+...@googlegroups.com <javascript:>. > For more options, visit https://groups.google.com/d/optout. > > > --- > Entertaining minecraft videos > http://YouTube.com/keybounce > > -- 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.
