From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dwarf.ash.relay.mailchannels.net (dwarf.ash.relay.mailchannels.net [23.83.222.53]) by sourceware.org (Postfix) with ESMTPS id 6DADD3858C74 for ; Tue, 20 Sep 2022 14:22:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6DADD3858C74 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 8AD6A921396; Tue, 20 Sep 2022 14:22:22 +0000 (UTC) Received: from pdx1-sub0-mail-a304 (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 1833D9214A1; Tue, 20 Sep 2022 14:22:22 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1663683742; a=rsa-sha256; cv=none; b=IhibsmkY3vVbiy2vnn1vUAgJtAwW/QvzCzp65kpvKnCegCtUUZ9DowEU0/uM4Mn8IsnW/i QL7iCahjRZ8HdCtYECoA742Ka+N9zi45fYrbRDEUcji1pMikzfClbSX7l87GcIuAu7ao1d xQtdDT2k6XT1LfCHKsxKR4VD/YPDlNxgu4/Rsmnh/gTYhnBZMrtNVRrztpU8qVt3yzfM9K 01fgtUvrTGOWlYDQaGdBnvNHnwDtsX3dhBwqGWnAkN/EHerB1RQmFZOf9aIDqlQWeYQk3M aOgSovteKerL5wj/bO/42HO0JyO8xFpNAVGXsgwtE+9cZ6TdSw8c6Q+TVra11w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1663683742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qBeeYMyZlPEw3SHg9mT1XafIy5BTGT3Bnww28Fl19Hk=; b=Iuk2ua5Ch8nm4/1M3c6fl1tTWBEX1T15RdBfJ2c/tlOx2fS54hJYVTQJ1XltnkJsjlhktS QA4+h7cDR4PDoBmNZNTC/hArUywROIu1iM/PdloO7wueqKnmcZgIMeLiMScmi3HsO/pSl3 tmYVcagYD6KmhC5xxegfQuqKmdqZE6aavfsBmZiKnud0KKTXyQ4Ffj/SqBkqe2AltOfxp9 t87GPD7/B04a53wjM4MPk+C2AwAzRGW4GnbTo6bCXcGa9W+fbhi962C6qUUfV3l1n+HFt3 3LYGo1670AffDm1zHbMG3GuKZR6oSbllQLNfZOSvgV1KenvC0yg8benFyDB4xA== ARC-Authentication-Results: i=1; rspamd-f776c45b8-n6pdg; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Well-Made-Left: 4338d68a2a85ea92_1663683742364_1862726733 X-MC-Loop-Signature: 1663683742364:2618811213 X-MC-Ingress-Time: 1663683742363 Received: from pdx1-sub0-mail-a304 (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.119.144.146 (trex/6.7.1); Tue, 20 Sep 2022 14:22:22 +0000 Received: from [192.168.0.182] (bras-vprn-toroon4834w-lp130-16-184-147-84-238.dsl.bell.ca [184.147.84.238]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a304 (Postfix) with ESMTPSA id 4MX3f50v90z3H; Tue, 20 Sep 2022 07:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1663683741; bh=qBeeYMyZlPEw3SHg9mT1XafIy5BTGT3Bnww28Fl19Hk=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=TxJBygJQYaRQdZG77u+NkY1RULkGAJ2xdKrDSUuKJhNNqf1PsWpe4yzTQWqO3ccoW T6pvZjrh+3XuiX9L63rJG5WLBMXmWtkaNLtzSWnxQv9m/7HWaeB2hVzdHDkPEplUZ5 FGbgoWn9Bmrvdezji62a7Eiu20MKZfcTUiXjv1Eu1TYh4NUbkjhfjDXReef66zrFX8 GmdXvI8g8YfHbmsEGkJBTg7Hk2dCwdS7XMlTde0DyXcc+ALD6szEuSc1gUxk0vDBAg n4ZFCKHMG38JMt4S6+rL3naJBnZ1bzHHDRs+oTnCRoOYmDVrzRXUk4vhU9XioCPOCB yNa8Lcewllylg== Message-ID: <20f3835e-ec1a-d6d3-3a1e-907be4e32c5d@gotplt.org> Date: Tue, 20 Sep 2022 10:22:19 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: remote: *** Pattern "Conflicts:" has been detected. Content-Language: en-US To: Florian Weimer , libc-alpha@sourceware.org References: <8735cmnw8a.fsf@oldenburg.str.redhat.com> From: Siddhesh Poyarekar In-Reply-To: <8735cmnw8a.fsf@oldenburg.str.redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3032.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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