Steve Yegge e7991b9334 fix: add retry with rebase for concurrent push conflicts ...

When multiple polecats run bd sync simultaneously, they race to push to
the shared beads-sync branch. Previously this caused non-fast-forward
errors that blocked all polecats.

Now pushFromWorktree:
- Detects non-fast-forward errors from git push output
- On conflict: fetches remote, rebases local commits on top, retries
- Uses exponential backoff for transient failures (up to 5 retries)
- Aborts rebase cleanly if it fails to leave worktree in good state

Fixes gt-zqor.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

2025-12-13 20:42:45 -08:00

..

syncbranch_test.go

fix: Add context.Background() to sqlite.New() calls in test files

2025-11-21 14:48:41 -05:00

syncbranch.go

Merge conflict resolution: sync-branch in config.yaml

2025-11-30 11:16:50 -08:00

worktree_divergence_test.go

fix: multiple safety check and sync improvements

2025-12-02 22:14:41 -08:00

worktree.go

fix: add retry with rebase for concurrent push conflicts

2025-12-13 20:42:45 -08:00