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

[Stefan Kangas]

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.