fix(update): reconcile local branches during update - #22037

Open

Niko96-dotcom wants to merge 5 commits into

NousResearch:mainfrom

Niko96-dotcom:fix/smart-update-local-branches

Commits on May 8, 2026

fix(update): reconcile local branches during update
Niko Mohr
committed
a3675f4

Commits on Sep 24, 2026

Merge upstream main into local-branch update PR
Niko Mohr
committed
12a0424
fix(update): reconcile local-only branches on active update target
Niko Mohr
committed
0bc442b
fix(update): verify rebase abort with recovery marker present
Niko Mohr
committed
f24b85a

Commits on Sep 30, 2026

Merge current main into local-branch update reconciliation

Niko Mohr
and
claude
committed
bb4c7a5