git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] pre-commit hook: less easily-tripped conflict marker detection

From
Junio C Hamano <junkio@cox.net>
Date
Jun 28, 2006, 01:58 UTC
Message-ID
<7vhd2659e4.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20060627223226.GA10178@soma>
Eric Wong <normalperson@yhbt.net> writes:
Show 5 quoted lines
>> Hmm.  Undecided.
>
> At this point, I think this is probably the best change to make.  There
> are many things that a user could do that an automated checker could
> miss, and there are also many things that it could be overchecking for.

Agreed to the latter part of the last sentence. Undecided about the rest and the implementation.

Show 7 quoted lines
>
> -	    if (/^(?:[<>=]){7}/) {
> +	    if (/^[<>]{7} / || /^={7}$/) {
>
> I would also make this change, because I'm pretty certain 7 characters
> (and one space for [<>]) is standard for merge(1).  We already rely on
> that for rerere.

One of the things we might want is to use diff3 instead of merge but I presume the latter is a thin wrapper around the former so that would be OK. I am however not enthused about the @unresolved array approach.

Previous: Eric Wong
Message 4 of 4 in “pre-commit hook: less easily-tripped conflict marker detection”
  1. pre-commit hook: less easily-tripped conflict marker detectionEric Wong, Jun 27, 2006
  2. Junio C HamanoJun 27, 2006
  3. Eric WongJun 27, 2006
  4. Junio C HamanoJun 28, 2006

Read the whole thread, see it on lore, or plain text.

$ 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.