Lukas May 5d1292c7ad fix: Use update-ref for fast-forward to avoid dirty working tree failures ...

fastForwardBranch used git merge --ff-only which fails when the clone
has uncommitted files. This caused the ff to be silently skipped, the
merge to proceed on stale main, and the push to fail (non-fast-forward).

Switched to update-ref which only moves the branch pointer without
touching the working tree.

2026-03-06 12:34:21 +01:00

..

branch-manager.ts

fix: Roll back merge when push fails in initiative approval

2026-03-06 12:31:35 +01:00

branch-naming.ts

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

clone.ts

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

index.ts

feat: Add merge conflict detection and agent resolution in initiative review

2026-03-06 11:17:25 +01:00

manager.test.ts

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

manager.ts

fix: Prevent lost task completions after server restart

2026-03-06 12:19:59 +01:00

project-clones.ts

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

remote-sync.ts

feat: Add remote sync for project clones

2026-03-05 11:45:09 +01:00

simple-git-branch-manager.test.ts

refactor: Restructure monorepo to apps/server/ and apps/web/ layout

2026-03-03 11:22:53 +01:00

simple-git-branch-manager.ts

fix: Use update-ref for fast-forward to avoid dirty working tree failures

2026-03-06 12:34:21 +01:00

types.ts

fix: Roll back merge when push fails in initiative approval

2026-03-06 12:31:35 +01:00