PR Sync Branch
Table of Contents
When to use this skill
The branch is stale relative to origin/main — rebase before doing anything else. Never address review comments or merge from a stale branch.
How to use this skill
Sync:
./projects/ores.compass/compass.sh pr sync
On conflicts it stops and lists the conflicted files and ways out.
- After a rebase, push with
git push --force-with-lease(orcompass pr sync --push).
Recipes
Reference
- Set SSH_AUTH_SOCK for git operations — source
build/scripts/set_ssh_agent.shbefore pushing.