Re: scratch/igc as feature branch

[Eli Zaretskii <eliz@gnu.org>]

> From: Gerd Möllmann <gerd.moellmann@gmail.com>
> Cc: emacs-devel@gnu.org
> Date: Wed, 03 Jul 2024 21:29:49 +0200
> 
> Does it mean that in the end, before merging, every commit must have a
> conforming commit message?

No, we only need to provide a commit log message that describes the
changes wrt the revision before the merge.  For example, a new file or
a new function that saw gobs of commits on the branch needs only to be
mentioned as new file or new function.  Other places need to be
mentioned as if all the changes were done in one go, and changes which
were later reverted don't need to be mentioned at all.

IOW, think about describing the merge "as if" you've rebased the
branch onto master (I say "as if" because IMO actually rebasing is not
a good idea).

> 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?

If they don't affect the code after the merge, they don't need to be
mentioned in the commit log message.  Or did you mean something other
than commit log messages?