From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 699673858D28 for ; Tue, 20 Sep 2022 11:03:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 699673858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663671834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=f4u4Kewe817qhOvXjMAOk3J+FOzy3lFxDwiXNX35fBM=; b=b8TVInBOMK/RqaUuaR0BPVWYg4FQ0Lvc1j1lUbutgWJI/V/N+SQi9XHXche0zzsdvHIJO9 Eyrk/znoLdUBsNhNmruxd7aY3OF+bmOW8W40ESMsjSfl9giJa+nAj7ErnyYJl+/S6jfIje hmE6+l8pddFtKoMpnlmyFSrbn0Xqc3Q= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-93-hbY5DBtHONW64a8FZFZ-hA-1; Tue, 20 Sep 2022 07:03:52 -0400 X-MC-Unique: hbY5DBtHONW64a8FZFZ-hA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6AA4387B2A1 for ; Tue, 20 Sep 2022 11:03:52 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.195.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CCCA539D7C for ; Tue, 20 Sep 2022 11:03:51 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: remote: *** Pattern "Conflicts:" has been detected. Date: Tue, 20 Sep 2022 13:03:49 +0200 Message-ID: <8735cmnw8a.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,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: 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