public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: remote: *** Pattern "Conflicts:" has been detected.
Date: Tue, 20 Sep 2022 13:03:49 +0200	[thread overview]
Message-ID: <8735cmnw8a.fsf@oldenburg.str.redhat.com> (raw)

I got this error while pushing a backport:

remote: *** Pattern "Conflicts:" has been detected.
remote: *** (in commit 1424e64f62978ab06bdb3b37f0812b00e5474aab)
remote: *** 
remote: *** This usually indicates a merge commit where some merge conflicts
remote: *** had to be resolved, but where the "Conflicts:" section has not 
remote: *** been deleted from the revision history.
remote: *** 
remote: *** Please edit the commit's revision history to either delete
remote: *** the section, or to avoid using the pattern above by itself.
remote: error: hook declined to update refs/heads/release/2.35/master

Do we actually want this check?  It's sometimes valuable to record
conflicts, why they happened, and how they have been resolved.

Thanks,
Florian


             reply	other threads:[~2022-09-20 11:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-20 11:03 Florian Weimer [this message]
2022-09-20 14:22 ` Siddhesh Poyarekar

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8735cmnw8a.fsf@oldenburg.str.redhat.com \
    --to=fweimer@redhat.com \
    --cc=libc-alpha@sourceware.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.
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).