6477: aarch64: reg cmd w/ force for rd & wr, sync |
https://review.openocd.org/c/openocd/+/6477
There's a big red Merge Conflict badge, which states "This change has
merge conflicts. Download the patch and run git rebase".
The patch has been rebased on top of a chain of patches, which have been
rebased on master.
gerrit reports no problems in the relation chain.
All commits compile successfully under jenkins.
git rebase on the patch does nothing.
So why does gerrit think there's a merge conflict here? And not with any
of the other patches underneath?
