continue

Resume a paused loom operation after resolving rebase conflicts.

Usage

git loom continue

When an in-scope loom command (commit, update, absorb, drop, fold) encounters a rebase conflict, it pauses instead of aborting. The operation is saved to .git/loom/state.json and the process exits with code 0.

The terminal output shows which files are conflicted and what to do next:

! Conflicts detected — resolve them with git, then run:
  loom continue   to complete the commit
  loom abort      to cancel and restore original state

Once you’ve resolved conflicts and staged the resolution:

# resolve conflicts in your editor, then:
git add <resolved-files>
git loom continue

What It Does

Loads the saved state from .git/loom/state.json
If a rebase is still in progress, runs git rebase --continue
- If that hits another conflict: stays paused, keeps the state file, exits successfully
- If it completes: moves on
If no rebase is in progress (e.g. you already ran git rebase --continue manually): skips to dispatch
Dispatches to the interrupted command’s post-rebase work (restoring staged patches, printing the success message, etc.)
Deletes the state file on success

Double Conflicts

If your branch has multiple conflicting commits, each loom continue may hit a new conflict at the next commit. Repeat the resolve-and-continue cycle as many times as needed:

git loom commit -b feature-auth -m "add auth" zz
# ! Conflicts detected...

git add auth.rs && git loom continue
# ! Conflicts remain — resolve them and run `loom continue` again

git add shared.rs && git loom continue
# ✓ Created commit `a1b2c3d` on branch `feature-auth`

Which Commands Are Paused

Command	Pauseable
`update`	✓
`commit`	✓
`absorb`	✓
`drop <commit>`	✓
`fold` (simple paths)	✓
`drop <branch>`	— (aborts immediately)
`reword`	— (aborts immediately)
`split`	— (aborts immediately)
`fold` (edit/multi-phase paths)	— (aborts immediately)

Commands Allowed While Paused

While a loom operation is paused, most commands are blocked. The following are still available:

show — inspect commits
trace — check recent command output
continue — resume the paused operation
abort — cancel the paused operation

Error: No Operation in Progress

git loom continue
# error: No loom operation is in progress

git-loom