Date: Thu, 28 Jul 2022 22:43:46 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: FreeBSD Mailing List <freebsd-ports@freebsd.org>, "ports-committers@FreeBSD.org" <ports-committers@freebsd.org> Subject: Handling conflicts and cherry-pick to 2022Q3 issue Message-ID: <CAFDf7UKYfm4-qNp_fzOz5rWqZwD5gNFk2HYTRbRHASXW2qzv1g@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
--0000000000004ec55e05e4e46e36 Content-Type: text/plain; charset="UTF-8" Hello, I'm trying to commit to 2022Q3 PR 265530 <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265330>; 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 <div dir=3D"ltr"><div>Hello,</div><div><br></div><div>I'm trying to com= mit to 2022Q3 PR <a href=3D"https://bugs.freebsd.org/bugzilla/show_bug.cgi?= id=3D265330">265530</a> and after solving Makefile 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</div><div>remote: Some parts = of your commit look suspiciously like merge<br>remote: conflict markers.=C2= =A0 Please double-check your diff and try<br>remote: committing again.<br>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<br>remote:<br>To gitrep= o.freebsd.org:ports.git<br>=C2=A0! [remote rejected] =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 2022Q3 -> 2022Q3 (pre-receive hook declined)<br>error: fai= led 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></div> --0000000000004ec55e05e4e46e36--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UKYfm4-qNp_fzOz5rWqZwD5gNFk2HYTRbRHASXW2qzv1g>