Skip to content

feat(rawr): add safety checks for Graphite sync with --force#26

Open
mateicanavra wants to merge 2 commits intocodex/integration-upstream-mainfrom
codex/daily-upstream-rebase-automation-noninteractive-sync
Open

feat(rawr): add safety checks for Graphite sync with --force#26
mateicanavra wants to merge 2 commits intocodex/integration-upstream-mainfrom
codex/daily-upstream-rebase-automation-noninteractive-sync

Conversation

@mateicanavra
Copy link

Improve Graphite rebase safety with --force flag

This PR enhances our rebase documentation and scripts to address safety concerns when using Graphite commands in non-interactive automation:

  1. Adds explicit guidance to use gt sync --no-restack --force --no-interactive for automation
  2. Updates rebase-daily.sh to verify local/remote trunk alignment before running gt sync --force
  3. Adds safety checks to prevent accidental trunk overwrites during checkpoint operations
  4. Documents cautions about running Graphite commands during merge operations

These changes help prevent potential data loss scenarios where gt sync might overwrite local trunk when it cannot fast-forward, especially in CI/automation contexts.

Copy link
Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@mateicanavra mateicanavra force-pushed the codex/daily-upstream-rebase-automation-noninteractive-sync branch 2 times, most recently from 05fa42b to 8af908c Compare February 7, 2026 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant