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

On Thu 24-05-18 13:11:20, Jeff King wrote: > On Thu, May 24, 2018 at 01:36:57PM +0200, Michal Hocko wrote: > > > `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 > > *

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

On Thu, May 24, 2018 at 01:36:57PM +0200, Michal Hocko wrote: > `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) >

unexpected "unresolved merge conflict" for a new file

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