ranch 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 >
> wrote:
>
>> I have recently been put in charge of a code repository that contains a
>> MASTER and several branc
n 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 >
> wrote:
>
> I have recently been put in charge of a code repository that contains a
> MASTER and several branches.
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
th
