fd12ad6740
All checks were successful
PR build (required check) / changes (pull_request) Successful in 14s
secrets-guard / encrypted (pull_request) Successful in 10s
shell-lint / shellcheck (pull_request) Successful in 11s
PR build (required check) / build-backend (pull_request) Has been skipped
PR build (required check) / build-frontend (pull_request) Has been skipped
PR build (required check) / validate-observability (pull_request) Has been skipped
PR build (required check) / gate (pull_request) Successful in 2s
Forgejo now allows only squash and fast-forward-only, so the three method= calls in this file named styles the API rejects: rebase for feat->dev, and merge commits for both promotions. An orchestrator following them gets a 405. The fast-forward paragraph said adopting ff-only 'needs a one-time reconciliation of the protected branches, which is the owner's decision'. That decision was taken and the reconciliation done — the trees were already identical, so it carried no content. release subset-of main subset-of dev now holds and promotions land the branches on the same SHA. The paragraph keeps the structural explanation, since it is what makes the failure mode recognisable, and now points at reconciliation as the remedy. |
||
|---|---|---|
| .. | ||
| hooks | ||
| BRANCHING.md | ||
| ownership.md | ||
| settings.json | ||