Re: emacs-29 e2ac0d416b9 1/5: ; Merge from origin/emacs-28

[Stefan Kangas]

Eli Zaretskii <eliz@gnu.org> writes:

> You could miss something or make a mistake, couldn't you?  It's
> possible.

Yes, of course.  That's why I prefer using standard git operations (as
opposed to merely copying); it is a way to mitigate that risk.

> I saw many more changes brought be the merge.

Please try again, but use the -b flag.  Otherwise, you will include
removal of trailing whitespace in three files.  (Our git hooks blocked
merging in the presence of such files.)

>> The risk is minimal
>
> Famous last words.
>
> Why should we have _any_ risk at all?  There's no gain here,
> absolutely none!  Risk with no gain makes no sense...

The gain is workflow efficiency, which is of course non-zero.  Merging,
in this case, is also a gain in simplicity and convenience.

When I said "minimal risk", that was is in reference to that we are
discussing documentation (non-code) files.  Sorry for being imprecise.
Meanwhile, copying file contents as juvenile commits is generally high
risk due to the limited traceability.