Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jun 10, 2021, 13:18 UTC
Message-ID: <60c21110a2e68_b25b12085a@natae.notmuch>
In-Reply-To: <60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org>

Johannes Sixt wrote:

Show 8 quoted lines

> Am 09.06.21 um 21:28 schrieb Felipe Contreras:
> > Virtually everyone is using it, and it's one of the first things we
> > teach newcomers in order to resolve conflicts efficiently.
> > 
> > Let's make it the default.
> 
> I tested diff3 style the VERY FIRST TIME the other day and was greated
> with the below. Needless to say that this change is a no-go from my POV.

"I found a bug" is not a valid reason not to do approach X.

The bug gets fixed and the approach continues.

Cheers.

-- 
Felipe Contreras

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.