Skip to content
Orbit Docs

Pre-pull error recovery

← All terms · Orbit-internal concepts

Orbit's safety mechanism that detects unresolved git conflict markers before pulling, preventing the queue from running on a broken working tree.

What it is

Before each queue dequeue, Orbit runs `git diff --check` to detect leftover conflict markers. If markers exist, the queue pauses. If clean, it pulls (when enabled). If a stash pop conflicts, ROLLBACK_POP runs `git reset --hard HEAD`, returns the prompt to its pre-execution status, and pauses. The Pipeline shows an explanation banner and resumes via "Re-scan working tree" after the user fixes.

When you would use it

This runs automatically. You see it when something interrupts the normal flow — a conflict marker appears, the queue pauses, and Orbit tells you why.

Common operations

  • Catching merge conflict residue before agent runs
  • Recovering from stash conflicts safely
  • Multi-machine workflows where pulls can hit unexpected conflicts

Related terms

Where this is taught

No learning path uses this term yet. Browse the Learning Atlas for guided sequences through related ideas.