From e02506b688c842e708d63aa4a491149b9935642a Mon Sep 17 00:00:00 2001 From: Alexander Whitestone Date: Wed, 15 Apr 2026 09:59:17 +0000 Subject: [PATCH] docs: document rebase-before-merge protection (#1253) --- .github/BRANCH_PROTECTION.md | 1 + 1 file changed, 1 insertion(+) 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