From nobody Thu Jul 28 21:43:46 2022 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lv40Z6jwQz4X232 for ; Thu, 28 Jul 2022 21:43:58 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lv40Z5nFxz3vfH; Thu, 28 Jul 2022 21:43:58 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659044638; 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=FpInjwSR2B1vakrf5deHZPVbg2TYGP25DNeF245aXqI=; b=QEQ8AffO4Ji6AWXcB9Iw2V59V0MlpQK4o4CkbRHy6bXduQ5kbFR0O1Ocpf+lEgUYhNzjWC LEKwXiBKaUph8wphuhNTwyc3ie7Pu1SVvGANm9zIq8Vo7mBlJg9owgoKGA/uxK4V8YZdvi rTRjhC3Q1aPCq8kN+VAYdQbDZonOxRU3BZ7k2mqk/o/jKLqRHxjxxpEBxcxmhySepiGfVN GJaX/YFGB7ofFmlgAjnl8j6UJlZfRknHO7RIhKJ2eOJL7ZhOja/bjoSkh6laC5wwPcagqC u6h/rp5HtUPLnbvzCwhRJqu1pwy8C4lNzkN6rECP9IDtmtp4rQQPenHXNojsCQ== Received: from mail-vs1-f43.google.com (mail-vs1-f43.google.com [209.85.217.43]) (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 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Lv40Z4lThzWLX; Thu, 28 Jul 2022 21:43:58 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vs1-f43.google.com with SMTP id 125so2834179vsd.5; Thu, 28 Jul 2022 14:43:58 -0700 (PDT) X-Gm-Message-State: AJIora9NTzjOsNvZevYjBQ/je8KJJ2oP90TmIAyI7j03oUyfHyUjtmyp 4SgrReDggsUJOXsuZKRYtIFPR2P3HXz7hM2i71s= X-Google-Smtp-Source: AGRyM1ur1KDnJDselkZcbrjd0UHKqNNRntnw/QwCCgTYXeIZu7WZ4GFVKyla3fSjaRU9NYtiMLbGTk0i0sh5Wanj4C8= X-Received: by 2002:a05:6102:366b:b0:358:5fa2:e7e8 with SMTP id bg11-20020a056102366b00b003585fa2e7e8mr233673vsb.19.1659044637883; Thu, 28 Jul 2022 14:43:57 -0700 (PDT) List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 From: Nuno Teixeira Date: Thu, 28 Jul 2022 22:43:46 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Handling conflicts and cherry-pick to 2022Q3 issue To: FreeBSD Mailing List , "ports-committers@FreeBSD.org" Content-Type: multipart/alternative; boundary="0000000000004ec55e05e4e46e36" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659044638; 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=FpInjwSR2B1vakrf5deHZPVbg2TYGP25DNeF245aXqI=; b=jc8QfNwx7r91MwDLMCgH+7mR7cBnQp60D3ud00kEkvy8YKxD2Itjbk3RuAOMqvCNEzNBIc 65VYZiBFpL0gMDAcdn96NIkurr+UWvgMDnO6QCCBAPN4svM+J6Zwm+a1UmKE4x+Hxh2ZBp JPRo6VhfBdcjUYUQmjjn1kSWlIvCwbb7skqlfEEVX3b8ZnYItU0qVzFvBQg6AYyCf35e0e JJzOO/9A+ddCpw9Vc75O8Z/a4TuyfwCRZjlq9a14mE9e4RRQTV/Cu4ibG5LsVAw+gjYrI2 05V/TreEiJzoG10EVPsETyCcnrZkb7fijwWBUdBjMQwY+8Y8LBH+9PNutolGbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659044638; a=rsa-sha256; cv=none; b=mlbHeTF/yFefg2l2xD5MUqX/FhmnwtquP0cPMPScjnmGzkoGXwG5QW+OysADgePdJFZBpT 7fLiU6fk9QbzlJfkB9ceWZNSL4aho37WQZ3m8qOOMURD3FBxGJYCs6dcy5aX6FlejQFrkD +ED+y4Fsv0/ivGgSdXkEqzJ0KDH7GuuMDwh2LQ+ICiREfB8O2cYvcYDdR6KycgfFzFV693 wcnhbO3gA+tb7JFJaKMt1cYMv9pSH4+S+1iTDRwGwrOmZU+E3Xm0E/lO2JDbBEtTCLgyhm bPMClUkTdA7BmJiUMFLjUOlZMkQdBO0GcdlhGTsMgKp4xjW4ckjA3Ve9ZnNHnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --0000000000004ec55e05e4e46e36 Content-Type: text/plain; charset="UTF-8" Hello, I'm trying to commit to 2022Q3 PR 265530 and after solving Makefile conflicts (PORTREVISIONs), git push gives the error: --- ================================================================ remote: Some parts of your commit look suspiciously like merge remote: conflict markers. Please double-check your diff and try remote: committing again. remote: ================================================================ remote: To gitrepo.freebsd.org:ports.git ! [remote rejected] 2022Q3 -> 2022Q3 (pre-receive hook declined) error: failed to push some refs to 'gitrepo.freebsd.org:ports.git' --- Any hints on how to solve it? Thanks in advance, Nuno Teixeira --0000000000004ec55e05e4e46e36 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

I'm trying to com= mit to 2022Q3 PR 265530 and after solving Makefile conflicts (PORTREVISIONs= ), git push gives the error:

---
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
remote: Some parts = of your commit look suspiciously like merge
remote: conflict markers.=C2= =A0 Please double-check your diff and try
remote: committing again.
r= emote: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
remote:
To gitrep= o.freebsd.org:ports.git
=C2=A0! [remote rejected] =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 2022Q3 -> 2022Q3 (pre-receive hook declined)
error: fai= led to push some refs to 'gitrepo.freebsd.org:ports.git'
= ---

Any hints on how to solve it?

Thanks in advance,

Nuno Teixeira



--0000000000004ec55e05e4e46e36--