chore: add agent rule to base new branches on upstream/main#3849
Merged
Conversation
Add a workspace-specific agent rule to ensure that new conversations/sessions and branches are always based on the latest upstream code to avoid using outdated code states.
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request introduces a new workspace rules file (.agents/rules/workspace.md) to guide agents on setting up their local branches. The feedback highlights a potential issue with setting the upstream tracking branch directly to upstream/main in a fork-and-PR workflow, suggesting the use of --no-track to prevent push permission failures.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
Add a workspace-specific agent rule and a helper script to ensure new conversations/sessions and branches are based on the latest upstream code and track it safely.
Rename the upstream tracking helper script to setup_triangle_branch.sh to better reflect the triangular Git workflow, and update the workspace rules accordingly.
Rename the upstream tracking helper script to create_triangle_branch.sh to better align with branch creation terminology, and update the workspace rules.
Rename the upstream tracking helper script back to setup_triangle_branch.sh to align with preferred naming, and update the workspace rules.
aignas
approved these changes
Jun 26, 2026
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
2 participants
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.
Add a workspace-specific agent rule to ensure that new conversations/sessions and branches are always based on the latest upstream code to avoid using outdated code states.
This comes about after having several sessions go haywire at the start because they
didn't see the latest changes.