You've already forked library-registry
mirror of
https://github.com/arduino/library-registry.git
synced 2025-07-31 01:03:09 +03:00
9710f18cd5
It's certain that merge conflicts will occur as submitters take time to resolve blocking issues and other submissions are accepted in the meantime. The PR merge will fail in this case. Previously there was no provision for handling merge conflicts. The workflow run just failed at the merge job with no comment from the bot. The goal is for the automated system to work with the submitter as much as possible. Towards this goal, when the merge fails, the bot will now comment to explain the problem and provide a link to a general tutorial for using the GitHub PR merge conflict system. A review is requested from the Tooling Team so that they can assist in the event the user is unable to resolve the merge conflict, or the failure was caused by something else.