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

Re: unexpected "unresolved merge conflict" for a new file

From
Jeff King <peff@peff.net>
Date
May 24, 2018, 17:11 UTC
Message-ID
<20180524171120.GC14876@sigill.intra.peff.net>
In-Reply-To
<20180524113657.GD20441@dhcp22.suse.cz>
On Thu, May 24, 2018 at 01:36:57PM +0200, Michal Hocko wrote:
Show 7 quoted lines
> `git commit' fails on a newly added file with the following
> *
> * You have some suspicious patch lines:
> *
> * In Documentation/core-api/gfp_mask-from-fs-io.rst
> * unresolved merge conflict (line 27)
> Documentation/core-api/gfp_mask-from-fs-io.rst:27:=======

This message isn't generated by git itself, but rather by a pre-commit hook. You can skip the hook by running "git commit --no-verify".

As for the false positive in the hook logic, I can't say more without having seen the hook source. :) Do you know where you got it from?

(Googling for "suspicious patch lines" turns up some hits, but with varying provenance).

-Peff
Previous: Michal HockoNext: Michal Hocko
Message 2 of 3 in “unexpected "unresolved merge conflict" for a new file”
  1. Michal HockoMay 24, 2018
  2. Jeff KingMay 24, 2018
  3. Michal HockoMay 25, 2018

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.