Clarify CMS back-sync boundary

2026-09-04 22:30:00 -04:00
parent e42d281b9a
commit 2f48055ce7
3 changed files with 12 additions and 9 deletions
@@ -214,8 +214,9 @@ altered by choosing another branch name.
   SloanOps approval.
 4. Merge deliberately, then confirm each affected production Worker workflow
   succeeds and smoke-test the public routes.
-5. Merge the resulting `main` commit back into `cms` through another
-   protected-branch pull request if the histories diverge.
+5. Merge `main` back into `cms` through another protected-branch pull request
+   only when its tree contains file changes missing from `cms`. Do not create a
+   history-only sync when the trees already match.
 6. Confirm previews remain no-index and never expand OAuth/CORS for a temporary
   branch alias.