Date: Thu, 28 Jul 2022 23:36:14 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Michael Gmelin <grembo@freebsd.org> Cc: FreeBSD Mailing List <freebsd-ports@freebsd.org>, "ports-committers@FreeBSD.org" <ports-committers@freebsd.org> Subject: Re: Handling conflicts and cherry-pick to 2022Q3 issue Message-ID: <CAFDf7ULmW7HsBO%2B3HcM1XZ4ypH0ZdUoJ40kudcKPVtS21kpy%2BA@mail.gmail.com> In-Reply-To: <588E794A-7FBC-4842-A828-35D9FF766E2C@freebsd.org> References: <CAFDf7UKYfm4-qNp_fzOz5rWqZwD5gNFk2HYTRbRHASXW2qzv1g@mail.gmail.com> <588E794A-7FBC-4842-A828-35D9FF766E2C@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000ece53805e4e52920 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable yes it is Michael Gmelin <grembo@freebsd.org> 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 c= onflict > 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 > Hello, > > I'm trying to commit to 2022Q3 PR 265530 > <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D265330>; 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 decline= d) > error: failed to push some refs to 'gitrepo.freebsd.org:ports.git' > --- > > Any hints on how to solve it? > > Thanks in advance, > > Nuno Teixeira > > > > --000000000000ece53805e4e52920 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">yes it is<br></div><br><div class=3D"gmail_quote"><div dir= =3D"ltr" class=3D"gmail_attr">Michael Gmelin <<a href=3D"mailto:grembo@f= reebsd.org">grembo@freebsd.org</a>> escreveu no dia quinta, 28/07/2022 = =C3=A0(s) 23:35:<br></div><blockquote class=3D"gmail_quote" style=3D"margin= :0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"= ><div dir=3D"auto"><div dir=3D"ltr"></div><div dir=3D"ltr">Look at what you= =E2=80=99re trying to commit and check if there are any conflict marker (&g= t;>>>>>>>>>>, <<<<<<<<= ;<>, =3D=3D=3D=3D=3D=3D=3D=3D=3D).</div><div dir=3D"ltr"><br><blockqu= ote type=3D"cite">On 28. Jul 2022, at 23:44, Nuno Teixeira <<a href=3D"m= ailto:eduardo@freebsd.org" target=3D"_blank">eduardo@freebsd.org</a>> wr= ote:<br><br></blockquote></div><blockquote type=3D"cite"><div dir=3D"ltr">= =EF=BB=BF<div dir=3D"ltr"><div>Hello,</div><div><br></div><div>I'm tryi= ng to commit to 2022Q3 PR <a href=3D"https://bugs.freebsd.org/bugzilla/show= _bug.cgi?id=3D265330" target=3D"_blank">265530</a> and after solving Makefi= le conflicts (PORTREVISIONs), git push gives the error:<br></div><div><br><= /div><div>---<br></div><div>=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</d= iv><div>remote: Some parts of your commit look suspiciously like merge<br>r= emote: conflict markers.=C2=A0 Please double-check your diff and try<br>rem= ote: committing again.<br>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<br>remote:<br>To gitrepo.freebsd.org:ports.git<br>=C2=A0! [remote rejec= ted] =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2022Q3 -> 2022Q3 (pre-receive ho= ok declined)<br>error: failed to push some refs to 'gitrepo.freebsd.org= :ports.git'</div><div>---</div><div><br></div><div>Any hints on how to = solve it?</div><div><br></div><div>Thanks in advance,</div><div><br></div><= div>Nuno Teixeira<br></div><div><br></div><div><br></div><div><br></div></d= iv> </div></blockquote></div></blockquote></div> --000000000000ece53805e4e52920--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7ULmW7HsBO%2B3HcM1XZ4ypH0ZdUoJ40kudcKPVtS21kpy%2BA>