Handling conflicts and cherry-pick to 2022Q3 issue

From: Nuno Teixeira <eduardo_at_freebsd.org>
Date: Thu, 28 Jul 2022 21:43:46 UTC

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: ================================================================
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