Date: Fri, 29 Jul 2022 00:35:05 +0200 From: Michael Gmelin <grembo@freebsd.org> To: Nuno Teixeira <eduardo@freebsd.org> Cc: FreeBSD Mailing List <freebsd-ports@freebsd.org>, ports-committers@freebsd.org Subject: Re: Handling conflicts and cherry-pick to 2022Q3 issue Message-ID: <588E794A-7FBC-4842-A828-35D9FF766E2C@freebsd.org> In-Reply-To: <CAFDf7UKYfm4-qNp_fzOz5rWqZwD5gNFk2HYTRbRHASXW2qzv1g@mail.gmail.com> References: <CAFDf7UKYfm4-qNp_fzOz5rWqZwD5gNFk2HYTRbRHASXW2qzv1g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail-784FFE7B-A761-4286-A10B-EA002D0C5E22 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Look at what you=E2=80=99re trying to commit and check if there are any conf= lict marker (>>>>>>>>>>>, <<<<<<<<<>, =3D=3D=3D=3D=3D=3D=3D=3D=3D). > On 28. Jul 2022, at 23:44, Nuno Teixeira <eduardo@freebsd.org> wrote: >=20 > =EF=BB=BF > Hello, >=20 > I'm trying to commit to 2022Q3 PR 265530 and after solving Makefile confli= cts (PORTREVISIONs), git push gives the error: >=20 > --- > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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' > --- >=20 > Any hints on how to solve it? >=20 > Thanks in advance, >=20 > Nuno Teixeira >=20 >=20 >=20 --Apple-Mail-784FFE7B-A761-4286-A10B-EA002D0C5E22 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable <html><head><meta http-equiv=3D"content-type" content=3D"text/html; charset=3D= utf-8"></head><body dir=3D"auto"><div dir=3D"ltr"></div><div dir=3D"ltr">Loo= k at what you=E2=80=99re trying to commit and check if there are any conflic= t marker (>>>>>>>>>>>, <<<<<= <<<<>, =3D=3D=3D=3D=3D=3D=3D=3D=3D).</div><div dir=3D"ltr"><b= r><blockquote type=3D"cite">On 28. Jul 2022, at 23:44, Nuno Teixeira <edu= ardo@freebsd.org> wrote:<br><br></blockquote></div><blockquote type=3D"ci= te"><div dir=3D"ltr">=EF=BB=BF<div dir=3D"ltr"><div>Hello,</div><div><br></d= iv><div>I'm trying to commit to 2022Q3 PR <a href=3D"https://bugs.freebsd.or= g/bugzilla/show_bug.cgi?id=3D265330">265530</a> and after solving Makefile c= onflicts (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</div><div>remot= e: Some parts of your commit look suspiciously like merge<br>remote: conflic= t markers. Please double-check your diff and try<br>remote: 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 g= itrepo.freebsd.org:ports.git<br> ! [remote rejected] &nbs= p; 2022Q3 -> 2022Q3 (pre-receive hook declined)<br>error: f= ailed to push some refs to 'gitrepo.freebsd.org:ports.git'</div><div>---</di= v><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></div> </div></blockquote></body></html>= --Apple-Mail-784FFE7B-A761-4286-A10B-EA002D0C5E22--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?588E794A-7FBC-4842-A828-35D9FF766E2C>