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

unexpected "unresolved merge conflict" for a new file

From
MHMichal Hocko <mhocko@kernel.org>
Date
May 24, 2018, 11:36 UTC
Message-ID
<20180524113657.GD20441@dhcp22.suse.cz>
Hi,
`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:=======

$ git status --porcelain A Documentation/core-api/gfp_mask-from-fs-io.rst

$ git --version git version 2.17.0

from debian.

Btw. the suspicious line is $ sed -n '27p' Documentation/core-api/gfp_mask-from-fs-io.rst =======

I believe this is a bug because a new file cannot have a conflict by definition and also there are no <<<<< in the file so there is no unresolved conflict there. So I guess the heuristic should be more clever.

Thanks!
-- 
Michal Hocko
SUSE Labs
Next: Jeff King
Message 1 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.