Re: Dealing with merge noise (was: Merging release branch)

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Sun, 31 Oct 2021 11:19:43 -0700
> Cc: Eli Zaretskii <eliz@gnu.org>, emacs-devel@gnu.org
> 
> Kévin Le Gouguec <kevin.legouguec@gmail.com> writes:
> 
> > (Not sure if this was suggested in past discussions, but maybe sticking
> > "--no-merges" in vc-git-log-switches can reduce the pain somewhat?)
> 
> You still want to know when emacs-28 was merged into master though.
> 
> The better solution is for everyone to just use "rebase" when they want
> to push their own local work to master, and "merge" when merging from
> emacs-28 or a feature branch.

We have decided long ago that we won't impose any restrictions on the
workflows people use, and allow both merges and rebases.  Whether or
not to rebase is a matter of personal preferences, many times
associated with strong feelings, and there's no need for us to bring
the disagreements about that into the project.  Allowing both styles
worked well for us since we switched to Git, so I see no reason to
deviate from that now.