unexpected "unresolved merge conflict" for a new file
- From
- Michal 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