From nobody Thu Jul 28 22:50:17 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 4Lv5TV1LCsz4XBrG for ; Thu, 28 Jul 2022 22:50:38 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4Lv5TV0wJTz42P6; Thu, 28 Jul 2022 22:50:38 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659048638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Txam6NOoTzFKDwtY+BPYOObhQTVdH/TsUmXVDggY2E8=; b=gou2ZVzVIVXIxokai6liA84L4Ds6QJXRD5Kbu7vc8MFegLNdG1RsNND1vSb3SX+8CHgwO7 /Vm8RctzZBxQNUIl/MDW/vmFis03gWqkBGucYtF8EoMfPAUIrqLxMKeFE3v7dG/euBmK17 y4mU8dYNUHIVugi6YJh+U+nPXNyn5+txVc/NQnxTWyFBvEjKQmyVn8HlsAtNxEQrCOKE/t OAmXF5Ktxge+yGJojpbXLDMeTUlCXvD+ryiSu+SVqR+NNwZEx9vl1sUt0M9j8nUPUrTK8E NcRltszah8uNJry4wngGkZvP4LyfPMDuoqdIfOu81I4RHCmz6GAOTIbBxE7hZg== Received: from mail-vs1-f53.google.com (mail-vs1-f53.google.com [209.85.217.53]) (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 4Lv5TT710SzWY8; Thu, 28 Jul 2022 22:50:37 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vs1-f53.google.com with SMTP id d187so2939099vsd.10; Thu, 28 Jul 2022 15:50:37 -0700 (PDT) X-Gm-Message-State: AJIora9XjxGo1/1eZJVhuiAI+XZxtC0Z4NZRRh74Zl3Oi2oFC15QZc0q LvlzrAjU5FJzegcUUlku1TcTaIIdANx4nqGVKxg= X-Google-Smtp-Source: AGRyM1skEHrEjBh6Eo4l9AohDg7dJ1jK4qU3pEqqcdre9nXDWg7+YCpaJwlM7yUPYnMQnge63Ys+9ePklnWrw/8WYk8= X-Received: by 2002:a67:f7d3:0:b0:35a:2a5c:488d with SMTP id a19-20020a67f7d3000000b0035a2a5c488dmr350622vsp.51.1659048637249; Thu, 28 Jul 2022 15:50:37 -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 References: <588E794A-7FBC-4842-A828-35D9FF766E2C@freebsd.org> In-Reply-To: From: Nuno Teixeira Date: Thu, 28 Jul 2022 23:50:17 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Handling conflicts and cherry-pick to 2022Q3 issue To: Michael Gmelin Cc: FreeBSD Mailing List , "ports-committers@FreeBSD.org" Content-Type: multipart/alternative; boundary="000000000000b0439f05e4e55cd2" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659048638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Txam6NOoTzFKDwtY+BPYOObhQTVdH/TsUmXVDggY2E8=; b=lM2aTj93Ua08kvpVWd2YtUfuaoCRfiNPsyaXTB2uhTDYcqFOOvb/Z+vaxCn/p7WhWXfABm +wOKIgOcpnW73r1SYMG+fv/QCbN2BifSO3KlV+2/taQSpv5cm2gRzX9NCMhYKabrPK5tHc Rf1l8sdhFopwX6QOwbXaCZLfTKQtGT1qPM4HyaqKXnGdHL9DZ0UlGfbXKN3gZdRroQuMgd 1SEFC+ceyRBsZfYC0KlFU7U/yGnl1O1e7uJqq2IeQdBLF2ZcWfN5tj8lUQBZj3Ss5f8Xe8 cmTZNfYJhWB09wQE293fsiiHnaKofG2G5zafB5Fx/+p2DqSUB2mPJM0evFVYyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659048638; a=rsa-sha256; cv=none; b=Q5z9ZF9bUlSKkY8BhnxPi9RKggGjXY1izhKXrx5fPzVTHU5Nc/+ukbz6xV7CIIYmoPdGLU wkqB96bk9NxrY9sgNdNU7FJ0IlK6qSiP6Omje1Y4mLGIzLPhP8IPAJGQSZokdVyGopWlbd exBb5Q4cYI+VxEzuxKkM15R/zjWVj32Mnqmcu8rR4vZLJqNkaPhMyZR17p3Sxg5EJupzK4 WoA/GOKHMEL6Qc220+LQx2K4xlgoDb4QSCyp7s2Ru0cbPwT6ppJVr8b1KFRbNlumuP0XwE ttOcPTkKVNc4xuKoWmi4u+RS9IZGwDEZW60EzmchiJ55hmY77lDoRRC4ahhdog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --000000000000b0439f05e4e55cd2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Fixed and committed, thanks Nuno Teixeira escreveu no dia quinta, 28/07/2022 =C3= =A0(s) 23:36: > yes it is > > Michael Gmelin escreveu no dia quinta, 28/07/2022 > =C3=A0(s) 23:35: > >> Look at what you=E2=80=99re trying to commit and check if there are any = conflict >> marker (>>>>>>>>>>>, <<<<<<<<<>, =3D=3D=3D=3D=3D=3D=3D=3D=3D). >> >> On 28. Jul 2022, at 23:44, Nuno Teixeira wrote: >> >> =EF=BB=BF >> Hello, >> >> I'm trying to commit 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. Please double-check your diff and try >> remote: committing again. >> remote: =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 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 >> >> >> >> --000000000000b0439f05e4e55cd2 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Fixed and committed, thanks

Nuno Teixeira <eduardo@freebsd.org> escreveu no dia= quinta, 28/07/2022 =C3=A0(s) 23:36:
yes it is

Michael Gmelin <grembo@freebsd.org&g= t; escreveu no dia quinta, 28/07/2022 =C3=A0(s) 23:35:
<= /div>
Look at what you=E2=80=99re trying to commit and chec= k if there are any conflict marker (>>>>>>>>>>= ;>, <<<<<<<<<>, =3D=3D=3D=3D=3D=3D=3D=3D= =3D).

On 28. Jul 2022, = at 23:44, Nuno Teixeira <eduardo@freebsd.org> wrote:

=EF=BB=BF
Hel= lo,

I'm trying to commit 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 you= r commit look suspiciously like merge
remote: conflict markers.=C2=A0 Pl= ease double-check your diff and try
remote: committing again.
remote:= =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 gitrepo.free= bsd.org:ports.git
=C2=A0! [remote rejected] =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 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
<= br>


--000000000000b0439f05e4e55cd2--