Reconciling Out-of-Sync Stacks
Use reconcile when stack metadata and remote state diverge.
Common causes:
- Someone pushed with
git pushinstead ofgg sync - A stack was edited across machines and mappings got stale
- Commits exist without GG-ID trailers
Preview changes safely
gg reconcile --dry-run
Apply reconciliation
gg reconcile
Reconcile can:
- Add missing GG-IDs to stack commits (via rebase)
- Map existing PRs/MRs to the right GG-IDs in config
After reconciling, run:
gg ls --refresh
gg sync