diff --git a/.github/BRANCH_PROTECTION.md b/.github/BRANCH_PROTECTION.md index 10878f1e..17c39557 100644 --- a/.github/BRANCH_PROTECTION.md +++ b/.github/BRANCH_PROTECTION.md @@ -12,6 +12,7 @@ All repositories must enforce these rules on the `main` branch: | Require CI to pass | ⚠ Conditional | Only where CI exists | | Block force push | ✅ Enabled | Protect commit history | | Block branch deletion | ✅ Enabled | Prevent accidental deletion | +| Require branch up-to-date before merge | ✅ Enabled | Surface conflicts before merge and force contributors to rebase | ## Default Reviewer Assignments