Closed antipole2 closed 3 months ago
See this:
This branch has conflicts that must be resolved Only those with write access to this repository can merge pull requests. Conflicting files ocpn-plugins.xml
Tony.... The problem here is that your PR contains and tries to commit "ocpn-plugins.xml". This file is automatically built by the post-commit scripts, and should NOT be a part of a valid PR. This is awkward to fix from my side. Suggest you remove this file from your PR, and re-submit as a new PR.
Closing and trying something else
Dave... been through it again and get same 'Can’t automatically merge' I think this is because I tried this
and it messed with ocpn-plugins.xml. The pull request has not run the checks - it needs some manual resolution of the conflict which, I think, only you can do.