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

  1. Sync:

    ./projects/ores.compass/compass.sh pr sync
    

    On conflicts it stops and lists the conflicted files and ways out.

  2. After a rebase, push with git push --force-with-lease (or compass pr sync --push).

Recipes

Reference

Emacs 29.1 (Org mode 9.6.6)