From: Jeff King <peff@peff.net>
To: Michal Hocko <mhocko@kernel.org>
Cc: git@vger.kernel.org
Subject: Re: unexpected "unresolved merge conflict" for a new file
Date: Thu, 24 May 2018 13:11:20 -0400 [thread overview]
Message-ID: <20180524171120.GC14876@sigill.intra.peff.net> (raw)
In-Reply-To: <20180524113657.GD20441@dhcp22.suse.cz>
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)
> 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
next prev parent reply other threads:[~2018-05-24 17:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-24 11:36 unexpected "unresolved merge conflict" for a new file Michal Hocko
2018-05-24 17:11 ` Jeff King [this message]
2018-05-25 7:22 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180524171120.GC14876@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mhocko@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).