Re: Handling conflicts and cherry-pick to 2022Q3 issue

Look at what you’re trying to commit and check if there are any conflict marker (>>>>>>>>>>>, <<<<<<<<<>, =========).

> On 28. Jul 2022, at 23:44, Nuno Teixeira <eduardo@freebsd.org> wrote:
> 
> 
> 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
> 
> 
>