public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* remote: *** Pattern "Conflicts:" has been detected.
@ 2022-09-20 11:03 Florian Weimer
  2022-09-20 14:22 ` Siddhesh Poyarekar
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Weimer @ 2022-09-20 11:03 UTC (permalink / raw)
  To: libc-alpha

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: remote: *** Pattern "Conflicts:" has been detected.
  2022-09-20 11:03 remote: *** Pattern "Conflicts:" has been detected Florian Weimer
@ 2022-09-20 14:22 ` Siddhesh Poyarekar
  0 siblings, 0 replies; 2+ messages in thread
From: Siddhesh Poyarekar @ 2022-09-20 14:22 UTC (permalink / raw)
  To: Florian Weimer, libc-alpha

On 2022-09-20 07:03, Florian Weimer via Libc-alpha wrote:
> 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.

I agree it makes sense to drop the check at least for release branches.

Sid

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-20 14:22 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-20 11:03 remote: *** Pattern "Conflicts:" has been detected Florian Weimer
2022-09-20 14:22 ` Siddhesh Poyarekar

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).