docs: clarify "shared branch" definition in git operations policy - #2306
Open
Michael Flanakin (flanakin) wants to merge 1 commit into
Open
docs: clarify "shared branch" definition in git operations policy#2306Michael Flanakin (flanakin) wants to merge 1 commit into
Michael Flanakin (flanakin) wants to merge 1 commit into
Conversation
Defines shared branches explicitly as main, dev, and features/*, and
carves out personal {username}/{branch} branches from the rebase,
force-push, and history-rewrite prohibitions. A personal branch stays
non-shared regardless of review or comment activity on it, so it can be
synced with dev via rebase instead of only merge.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Michael Flanakin (flanakin)
requested a review
from Brett Wilson (MSBrett)
as a code owner
September 8, 2026 02:10
microsoft-github-policy-service
Bot
added
the
Micro PR 🔬
microsoft-github-policy-service
Bot
added
the
Needs: Review 👀
Copilot started reviewing on behalf of
Michael Flanakin (flanakin)
September 8, 2026 02:10
View session
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The updated policy introduces an internal wording contradiction (“all git operations” being non-destructive) that should be qualified to align with the newly permitted history-rewrite actions on personal branches.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Clarifies the repository’s Git Operations Policy by explicitly defining which branches are considered “shared” and documenting when history-rewrite operations are allowed, helping reviewers and contributors apply consistent rules during conflict resolution and branch maintenance.
Changes:
- Defines “shared branches” as
main,dev, andfeatures/*, and clarifies that{username}/{branch}is personal even with review activity. - Updates rebase/force-push guidance to prohibit these on shared branches while permitting them on personal branches.
- Updates conflict-resolution guidance to allow either merge or rebase on personal branches, but only merge on shared branches.
File summaries
| File | Description |
|---|---|
| AGENTS.md | Documents an explicit shared-branch definition and refines rebase/force-push/conflict-resolution rules to distinguish shared vs. personal branches. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
171
to
+173
| This repository supports production infrastructure managing significant revenue. All git operations must be non-destructive and preserve full commit history. | ||
|
|
||
| **What counts as "shared":** `main`, `dev`, and `features/*` branches. A personal `{username}/{branch}` branch is not shared, regardless of review or comment activity on it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🛠️ Description
Clarifies what counts as a "shared" branch in the repo's Git Operations Policy. Previously "shared branches" was undefined, which came up in PR #2285 when deciding whether rebase/force-push were permitted on a personal
flanakin/*branch that already had review activity.This PR defines shared branches explicitly as
main,dev, andfeatures/*, and clarifies that a personal{username}/{branch}branch is not shared regardless of review or comment activity on it. It also updates the rebase, force-push, and history-rewrite prohibitions and the conflict-resolution guidance to carve out personal branches accordingly — a personal branch can now be rebased ontodev(and force-pushed after) to resolve conflicts, in addition to the existing merge option.📋 Checklist
🔬 How did you test this change?
Docs-only change to
AGENTS.md— no build or deploy impact.📦 Deploy to test?
Not applicable.
🙋♀️ Do any of the following that apply?
📑 Did you update
docs/changelog.md?📖 Did you update documentation?
🤖 Generated with Claude Code