Skip to content

chore: Clarify instructions in upstream sync workflow #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NeiRo21 merged 1 commit into from
May 15, 2026
Merged

chore: Clarify instructions in upstream sync workflow #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .clinerules/workflows/sync-with-upstream.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ Ask the user to resolve the outstand merge conflicts and wait for confirmation.

## Step 11: Validate merge

Run the standard build workflow (as defined in `AGENTS.md`) to validate the merge. In case of any issues, report them to the user and ask how to proceed.
Run the standard build workflow (as defined in `AGENTS.md`) to validate the merge. In case of build or test failures, or any other issues, report them to the user and ask how to proceed.

## Step 12: Commit conflict resolution changes

Expand Down