Re: Git is not recognizing some merge conflicts and just accepting incoming master version

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 15, 2024, 22:29 UTC
Message-ID: <xmqqzfuznn7g.fsf@gitster.g>
In-Reply-To: <ebd073ef-4ba4-44df-919a-2adefb40e3e7@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

Show 6 quoted lines

> That's the responsibility of the person doing the merge, who at best
> understands both branches being merged.[*] It is of utmost importance
> that a merge result produced by Git is not taken without thinking. It is
> never a no-brainer.
>
> [*] That is where good commit messages shine.

I am glad that some folks appreciate what I do every day ;-)