Skip to content

[codex] Preserve worktree metadata during branch sync - #3822

Merged
juliusmarminge merged 3 commits into
mainfrom
codex/fix-worktree-branch-sync
Jul 9, 2026
Merged

[codex] Preserve worktree metadata during branch sync#3822
juliusmarminge merged 3 commits into
mainfrom
codex/fix-worktree-branch-sync

guard branch sync with expected state

c8405ef
Select commit
Loading
Failed to load commit list.
MacroscopeApp / Macroscope - Approvability Check succeeded Jul 9, 2026 in 8m 50s

Approved (click on check for details)

  • Eligibility
  • Correctness

Note

More information about how approvability works can be found in our Help Center.

Details

Eligibility
This PR fixes a race condition where stale branch sync operations could overwrite updated branch metadata. The fix uses optimistic concurrency control, is well-tested, and the author owns this code area. Straightforward bug fix with limited scope.

Notes:
No code owners found in target merge base e912765