Clarify git workflow: push to PR branch, don't create separate branches#33963

Merged

PureWeen merged 4 commits intomainfrom

fix/amend-git-workflow-rule

Feb 25, 2026

Contributor

StephaneDelcroix commented Feb 9, 2026

Note

Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!

Description

Adds rule #2 to the Git Workflow section in copilot-instructions.md:

When fixing CI or amending an existing PR, commit directly to the PR branch. Do not create a separate branch off a PR branch — the PR branch already IS a feature branch. Creating a new branch means CI will not run on the PR, defeating the purpose.

Also adds a code example showing the correct workflow (gh pr checkout → commit → push).

Motivation

Copilot CLI was incorrectly creating separate branches when asked to fix CI on existing PRs, because rule #1 ("never commit to main, create a feature branch") was being over-generalized to PR branches. This caused wasted time since CI only runs on PR branches.

Copilot AI review requested due to automatic review settings

February 9, 2026 12:57

Copilot started reviewing on behalf of StephaneDelcroix

February 9, 2026 12:58

StephaneDelcroix added the t/housekeeping ♻︎ label

Copilot AI reviewed

View reviewed changes

Contributor

Copilot AI left a comment

Pull request overview

Updates the repository’s Copilot CLI git workflow guidance to clarify how to contribute fixes to an existing PR, aiming to prevent creating “branch-off-a-PR-branch” situations that don’t update the original PR (and therefore don’t run CI for it).

Changes:

Add a new Git Workflow rule instructing commits to be made directly on the existing PR branch when fixing CI / amending a PR.
Renumber existing git workflow rules accordingly.
Add an example workflow using gh pr checkout followed by commit and push.

.github/copilot-instructions.md Outdated

+              **When fixing CI or contributing to an existing PR:**
+              ```bash
+              # Checkout the PR branch directly (do NOT create a new branch off it)

Copilot AI Feb 9, 2026

Same grammar issue here: "Checkout" should be "Check out" in the example comment.

Suggested change

      
            # Checkout the PR branch directly (do NOT create a new branch off it)
          
            # Check out the PR branch directly (do NOT create a new branch off it)

Copilot uses AI. Check for mistakes.

.github/copilot-instructions.md Outdated

Comment on lines +166 to +169

+              # Make fixes, commit, and push to the PR branch
+              git add .
+              git commit -m "Fix: Description of the change"
+              git push

Copilot AI Feb 9, 2026

The example workflow ends with an unconditional git push, which conflicts with rule #4 (“do NOT automatically push” when amending an existing PR). Consider updating the example to stop before pushing and instruct the agent to ask first, or explicitly label the example as only for the case where the user requested a push.

Suggested change

      
            # Make fixes, commit, and push to the PR branch
          
            git add .
          
            git commit -m "Fix: Description of the change"
          
            git push
          
            # Make fixes and commit to the PR branch
          
            git add .
          
            git commit -m "Fix: Description of the change"
          
            # Do NOT push automatically; ask the user before running: git push

Copilot uses AI. Check for mistakes.

.github/copilot-instructions.md Outdated

Comment on lines +139 to +143

    
              2. **When fixing CI or amending an existing PR, commit directly to the PR's branch** - Do NOT create a separate branch. The PR branch already IS a feature branch. Creating a new branch off a PR branch means CI won't run on the PR, defeating the purpose. Checkout the PR branch, commit, and push to it.

              3. **When amending an existing PR, do NOT automatically push** - After making changes to an existing PR branch, ask the user before pushing. This allows the user to review the changes locally first. Exception: If the user's instructions explicitly include pushing, proceed without asking.

              3. **Do NOT rebase, squash, or force-push** unless explicitly requested by the user. These operations rewrite git history and can cause problems for other contributors. Default behavior should be regular commits and pushes.

              4. **When amending an existing PR, do NOT automatically push** - After making changes to an existing PR branch, ask the user before pushing. This allows the user to review the changes locally first. Exception: If the user's instructions explicitly include pushing, proceed without asking.

Copilot AI Feb 9, 2026

Rule #2 says to "commit, and push" to the PR branch, but rule #4 says that when amending an existing PR you must ask the user before pushing (unless explicitly instructed). Please reconcile these instructions (e.g., reference rule #4’s exception in rule #2, or soften the wording around pushing).

Copilot uses AI. Check for mistakes.

.github/copilot-instructions.md Outdated

    
              1. **NEVER commit directly to `main`** - Always create a feature branch for your work. Direct commits to `main` are strictly prohibited.

              2. **Do NOT rebase, squash, or force-push** unless explicitly requested by the user. These operations rewrite git history and can cause problems for other contributors. Default behavior should be regular commits and pushes.

              2. **When fixing CI or amending an existing PR, commit directly to the PR's branch** - Do NOT create a separate branch. The PR branch already IS a feature branch. Creating a new branch off a PR branch means CI won't run on the PR, defeating the purpose. Checkout the PR branch, commit, and push to it.

Copilot AI Feb 9, 2026

Grammar: "Checkout" should be "Check out" when used as a verb (e.g., "Check out the PR branch...").

Suggested change

      
            2. **When fixing CI or amending an existing PR, commit directly to the PR's branch** - Do NOT create a separate branch. The PR branch already IS a feature branch. Creating a new branch off a PR branch means CI won't run on the PR, defeating the purpose. Checkout the PR branch, commit, and push to it.
          
            2. **When fixing CI or amending an existing PR, commit directly to the PR's branch** - Do NOT create a separate branch. The PR branch already IS a feature branch. Creating a new branch off a PR branch means CI won't run on the PR, defeating the purpose. Check out the PR branch, commit, and push to it.

Copilot uses AI. Check for mistakes.

PureWeen reviewed

View reviewed changes

.github/copilot-instructions.md Outdated

    
              1. **NEVER commit directly to `main`** - Always create a feature branch for your work. Direct commits to `main` are strictly prohibited.

              2. **Do NOT rebase, squash, or force-push** unless explicitly requested by the user. These operations rewrite git history and can cause problems for other contributors. Default behavior should be regular commits and pushes.

              2. **When fixing CI or amending an existing PR, commit directly to the PR's branch** - Do NOT create a separate branch. The PR branch already IS a feature branch. Creating a new branch off a PR branch means CI won't run on the PR, defeating the purpose. Checkout the PR branch, commit, and push to it.

Member

PureWeen Feb 9, 2026

Should we remove the "push to it" language here? That seems somewhat in opposition to the suggestion of never pushing?

Contributor Author

StephaneDelcroix Feb 25, 2026

Good catch — I've updated the wording to say "commit (but see rule #4 before pushing)" which defers to rule #4's explicit "do NOT automatically push" instruction. The old "push to it" language has been removed.

PureWeen requested changes

View reviewed changes

Member

PureWeen left a comment

Review copilot comments and this one
https://github.com/dotnet/maui/pull/33963/changes#r2783062548

StephaneDelcroix requested a review from PureWeen

February 12, 2026 14:08

rmarinho added s/agent-approved s/agent-fix-win s/agent-reviewed labels

dotnet deleted a comment from rmarinho

kubaflo removed s/agent-reviewed s/agent-approved s/agent-fix-win labels

StephaneDelcroix force-pushed the fix/amend-git-workflow-rule branch from 95f889a to 6a5a571 Compare

February 24, 2026 13:49

StephaneDelcroix and others added 3 commits

February 25, 2026 13:30


          Clarify git workflow: push to PR branch, don't create separate branches

fbe88fb


          Address review comments: rephrase rule #2, fix push contradiction, gr…

24ae5d4

…ammar fixes


          Address review feedback: reconcile push guidance in git workflow rules

a7f6913

- Rule #2 now explicitly references rule #4 before pushing
- Removes implicit 'commit there' language that contradicted the no-auto-push rule
- Addresses Copilot reviewer and PureWeen's feedback about contradictory push guidance

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

StephaneDelcroix force-pushed the fix/amend-git-workflow-rule branch from 6a5a571 to a7f6913 Compare

February 25, 2026 12:30


          Consolidate duplicate git workflow sections and apply minor wording i…

541d652

…mprovements

- Merge rule #4 (no auto-push) into rule #2 (work on PR branch)
- Combine 'When amending' and 'When asked to update' into single section
- Add emphasis on pause before pushing (multi-model reviewed)
- Net result: fewer rules, same guidance, no ambiguity

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

PureWeen approved these changes

View reviewed changes

PureWeen merged commit 073c8cb into main

2 of 3 checks passed

PureWeen deleted the fix/amend-git-workflow-rule branch

February 25, 2026 21:48

This was referenced Feb 26, 2026

[repo-status] Daily Status Report - February 26, 2026 #34253

Closed

[repo-status] Daily Status Report - February 28, 2026 #34288

Closed

TamilarasanSF4853 pushed a commit to TamilarasanSF4853/maui that referenced this pull request


          Clarify git workflow: push to PR branch, don't create separate branch…

82d123b

…es (dotnet#33963)

<!-- Please let the below note in for people that find this PR -->
> [!NOTE]
> Are you waiting for the changes in this PR to be merged?
> It would be very helpful if you could [test the resulting
artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from
this PR and let us know in a comment if this change resolves your issue.
Thank you!

## Description

Adds rule dotnet#2 to the Git Workflow section in copilot-instructions.md:

**When fixing CI or amending an existing PR, commit directly to the PR
branch.** Do not create a separate branch off a PR branch — the PR
branch already IS a feature branch. Creating a new branch means CI will
not run on the PR, defeating the purpose.

Also adds a code example showing the correct workflow (`gh pr checkout`
→ commit → push).

## Motivation

Copilot CLI was incorrectly creating separate branches when asked to fix
CI on existing PRs, because rule dotnet#1 ("never commit to main, create a
feature branch") was being over-generalized to PR branches. This caused
wasted time since CI only runs on PR branches.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>

github-actions bot locked and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

t/housekeeping ♻︎