search

OpenCPN / plugins

Container Project for an Integrated Plugin Management Facility
17 stars 19 forks source link

v3.0.5 build c #1116

Closed antipole2 closed 3 months ago

antipole2 commented 3 months ago

Dave... been through it again and get same 'Can’t automatically merge' I think this is because I tried this

Create a catalog and check it against the xsd specification: $ tools/ocpn-metadata generate --userdir metadata/ \ --destfile ocpn-plugins.xml --force $ xmllint --noout ocpn-plugins.xml

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.

antipole2 commented 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

bdbcat commented 3 months ago

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.

antipole2 commented 3 months ago

Closing and trying something else