From: Konstantin Tokarev <annulen@yandex.ru>
To: Leam Hall <leamhall@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Branch Management questions
Date: Thu, 15 Oct 2020 12:55:17 +0300 [thread overview]
Message-ID: <2011231602755586@mail.yandex.ru> (raw)
In-Reply-To: <595540a9-0000-8dcd-c555-3168d1b2d066@gmail.com>
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.
>
> 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
next prev parent reply other threads:[~2020-10-15 10:01 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 [this message]
2020-10-15 10:30 ` Leam Hall
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2011231602755586@mail.yandex.ru \
--to=annulen@yandex.ru \
--cc=git@vger.kernel.org \
--cc=leamhall@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).