From: Leam Hall <leamhall@gmail.com>
To: Konstantin Tokarev <annulen@yandex.ru>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Branch Management questions
Date: Thu, 15 Oct 2020 06:30:22 -0400 [thread overview]
Message-ID: <d10fd33c-3d5a-c5ed-c21c-6e6eff1a6351@gmail.com> (raw)
In-Reply-To: <2011231602755586@mail.yandex.ru>
On 10/15/20 5:55 AM, Konstantin Tokarev wrote:
>
>
> 15.10.2020, 12:51, "Leam Hall" <leamhall@gmail.com>:
>> 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.
Unfortunately, for some tasks 1-4 weeks is atomic. The review process is
being improved as well. We still need a way to integrate the
longer-lived branches cleanly. We've already had issues where attempts
meant lost code.
>> 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).
Ah, so "Stop work on P, Resolve X, Rebase P from updated parent"? Let me
go read up on that, it makes sense.
Thanks!
Leam
next prev parent reply other threads:[~2020-10-15 10:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 9:51 Branch Management questions Leam Hall
2020-10-15 9:55 ` Konstantin Tokarev
2020-10-15 10:30 ` Leam Hall [this message]
2020-10-15 10:39 ` Konstantin Tokarev
2020-10-15 19:57 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d10fd33c-3d5a-c5ed-c21c-6e6eff1a6351@gmail.com \
--to=leamhall@gmail.com \
--cc=annulen@yandex.ru \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).