The merge-forward workflow failed to merge main into the following skill branches:
skill/apple-container: merge conflict, build failure, or test failure
skill/compact: merge conflict, build failure, or test failure
skill/ollama-tool: merge conflict, build failure, or test failure
skill/remote-mcp-servers: merge conflict, build failure, or test failure
skill/web-ui: merge conflict, build failure, or test failure
Please resolve manually:
git checkout skill/apple-container
git merge main
# resolve conflicts, then: git push
git checkout skill/compact
git merge main
# resolve conflicts, then: git push
git checkout skill/ollama-tool
git merge main
# resolve conflicts, then: git push
git checkout skill/remote-mcp-servers
git merge main
# resolve conflicts, then: git push
git checkout skill/web-ui
git merge main
# resolve conflicts, then: git push
The merge-forward workflow failed to merge
maininto the following skill branches:skill/apple-container: merge conflict, build failure, or test failureskill/compact: merge conflict, build failure, or test failureskill/ollama-tool: merge conflict, build failure, or test failureskill/remote-mcp-servers: merge conflict, build failure, or test failureskill/web-ui: merge conflict, build failure, or test failurePlease resolve manually: