From: Andrea Corallo <acorallo@gnu.org>
To: "Gerd Möllmann" <gerd.moellmann@gmail.com>
Cc: emacs-devel@gnu.org
Subject: Re: scratch/igc as feature branch
Date: Wed, 03 Jul 2024 18:04:16 -0400 [thread overview]
Message-ID: <yp1tth6i13z.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <m2le2is28i.fsf@pro2.fritz.box> ("Gerd Möllmann"'s message of "Wed, 03 Jul 2024 21:29:49 +0200")
Gerd Möllmann <gerd.moellmann@gmail.com> writes:
> Andrea Corallo <acorallo@gnu.org> writes:
>
>> - The fact that the branch is already worked with commits that will be
>> directly mergable without having to do a mega rebase afterward. Also
>> the mega rebase would cancel all or part of the history which I find a
>> serious disadvantage.
>
> Hm, that makes me curious.
>
> Does it mean that in the end, before merging, every commit must have a
> conforming commit message?
I don't know if we have to be 100% strict on this, my opinion is that
would be a pity to loose the history of the branch we already have, but
others might have other opinions. OTOH given we know *now* that the
goal is to try to merge, it would feel very weired to me to deliberatly
ignore what we have in CONTRIBUTE as requirements for commits we are
writing now and we know we want to include.
> Also, there are probably many hundreds of
> commits that are not in scratch/igc at all, but only in my original.
> What's with those?
We are discussing igc, how do these other commits come into play?
Andrea
next prev parent reply other threads:[~2024-07-03 22:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-03 12:40 scratch/igc as feature branch Andrea Corallo
2024-07-03 17:44 ` Gerd Möllmann
2024-07-03 19:01 ` Andrea Corallo
2024-07-03 19:29 ` Gerd Möllmann
2024-07-03 19:37 ` Gerd Möllmann
2024-07-04 4:58 ` Eli Zaretskii
2024-07-04 6:19 ` Gerd Möllmann
2024-07-03 22:04 ` Andrea Corallo [this message]
2024-07-04 4:15 ` Gerd Möllmann
2024-07-04 6:15 ` Eli Zaretskii
2024-07-04 4:49 ` Eli Zaretskii
2024-07-04 6:14 ` Gerd Möllmann
2024-07-04 6:26 ` Eli Zaretskii
2024-07-04 6:55 ` Gerd Möllmann
2024-07-04 7:41 ` Eli Zaretskii
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=yp1tth6i13z.fsf@fencepost.gnu.org \
--to=acorallo@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=gerd.moellmann@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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.