@MSGID:
<877cpdakxu.fsf@doppelsaurus.mobileactivedefense.com> 76470e03
@REPLY: <20230825113441.899@kylheku.com> 235974e0
@REPLYADDR Rainer Weikusat
<rweikusat@talktalk.net>
@REPLYTO 2:5075/128 Rainer Weikusat
@CHRS: CP866 2
@RFC: 1 0
@RFC-Message-ID:
<877cpdakxu.fsf@doppelsaurus.mobileactivedefense.com>
@RFC-References: 1@dont-email.me>
<87wmxps26h.fsf@bsb.me.uk>1@dont-email.me> <87r0nxrvm1.fsf@bsb.me.uk>1@dont-email.me>
<87zg2jrk7t.fsf@bsb.me.uk>1@dont-email.me><87lee2qz5v.fsf@bsb.me.uk>1@dont-email.me><20230823195415.19d4c01e
0cb2ca57faf92c07@g{oogle}mail.com>2@dont-email.me> 1@dont-email.me><20230824083325.525@kylheku.com>
1@dont-email.me>GMN3.79590@fx16.iad>1@dont-email.me><20230824160017.406@kylheku.com><87edjrhz1d.fsf@do
ppelsaurus.mobileactivedefense.com><20230825095521.754@kylheku.com><87a5ufhtk5.f
sf@doppelsaurus.mobileactivedefense.com><20230825113441.899@kylheku.com>
an> @TZUTC: 0100
@PID: Gnus/5.13 (Gnus v5.13) Emacs/27.1
(gnu/linux)
@TID: FIDOGATE-5.12-ge4e8b94
Kaz Kylheku <864-117-4973@kylheku.com> writes:
> On 2023-08-25, Rainer Weikusat <rweikusat@talktalk.net> wrote:

[configure & friends in git]

>> If the files generated from these are also in the repository,
>> nuisance git dances will have to be performed to deal with them and this
>> will also cause nuisance merge conflicts for updates.
>
> If you merge parallel changes to a primary file from which a secondary
> file is generated, you must regenerate the secondary file. The seconary
> file should not be merged. (That would be editing, and generated files
> are "generated, do not edit", right?)

Precisely. But git will try to merge them nevertheless and the resulting
merge conflicts need to be dealt with somehow. A good way to do so is

Never check anything into git which is supposed to generated from
something else also checked into git. In case someone else did this,
remove it. 
--- Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
 * Origin: usenet.network (2:5075/128)
SEEN-BY: 5001/100 5005/49 5010/352 5015/255 5019/40
5020/715 848 1042 4441
SEEN-BY: 5020/12000 5030/49 1081 5075/128
@PATH: 5075/128 5020/1042 4441