Re: Branch Management questions

From: Konstantin Tokarev <annulen@yandex.ru>
Date: Oct 15, 2020, 09:55 UTC
Message-ID: <2011231602755586@mail.yandex.ru>
In-Reply-To: <595540a9-0000-8dcd-c555-3168d1b2d066@gmail.com>

15.10.2020, 12:51, "Leam Hall" <leamhall@gmail.com>:

Show 8 quoted lines

> 1. Two developers.
>    Dev A is working on Branch A, off a release_candidate branch.
>    Dev B is working on Branch B, off the same release_candidate branch.
>    Branches usually run 1-4 weeks.
>    Dev A does some work that would help Branch B.
>    How does Dev A get the Branch B work that is needed, in a
>      way that does not confuse the merge process at the end
>      of the release cycle?

Avoid long-living branches and integrate atomic parts of work into base branch as soon as it's done and reviewed.

Show 7 quoted lines

>
> 2. One developer.
>    Working on Branch P, realizes that a new functionality X is
>      needed.
>    X isn't specific to Branch P, but critical to it.
>    What is the best way to deal with X, knowing that further work
>      on X will need to be done?

Rebase P to the top of parent branch after X is integrated (see above).

-- Regards, Konstantin