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

From: Junio C Hamano <[email-masked]>
Date: Fri, 15 Mar 2024 15:29:23 -0700

Johannes Sixt <[email-masked]> writes:

> 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 ;-)