From: Andreas Enge <andreas@enge.fr>
To: Christopher Baines <mail@cbaines.net>
Cc: guix-devel@gnu.org, 70549@debbugs.gnu.org
Subject: [bug#70549] Managing patches and branches, retrospective and futher changes?
Date: Mon, 29 Apr 2024 15:24:15 +0200 [thread overview]
Message-ID: <Zi-ff4xC0teYgXsf@jurong> (raw)
In-Reply-To: <87o79yvqtn.fsf@cbaines.net>
Hello,
Am Wed, Apr 24, 2024 at 02:21:56PM +0100 schrieb Christopher Baines:
> Let me know if you have any thoughts or questions!
in this part:
+@item
+Minimise the changes on master that are missing on the branch prior to
+merging the branch in to master. Merging master in to the branch can be
+appropriate for this purpose.
I would drop the second sentence. It mildly contradicts the previous
"avoid merging master into the branch". Writing "avoid merging" instead
of "never merge" already allows for some leeway, I would prefer not to
insist on it.
Andreas
next prev parent reply other threads:[~2024-04-29 13:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 13:21 Managing patches and branches, retrospective and futher changes? Christopher Baines
2024-04-25 7:29 ` Steve George
2024-04-25 18:28 ` [bug#70549] " Christopher Baines
2024-04-26 16:03 ` Efraim Flashner
2024-04-29 13:24 ` Andreas Enge [this message]
2024-04-29 14:42 ` Christopher Baines
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: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Zi-ff4xC0teYgXsf@jurong \
--to=andreas@enge.fr \
--cc=70549@debbugs.gnu.org \
--cc=guix-devel@gnu.org \
--cc=mail@cbaines.net \
/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://git.savannah.gnu.org/cgit/guix.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).