Lukas May 0c04a1d273 fix: Prevent conflict resolution agent from destroying initiative branch ...

spawnConflictResolutionAgent was passing the initiative branch as branchName,
causing SimpleGitWorktreeManager.create() to force-reset it to the target
branch. Now spawns on a unique temp branch based off the initiative branch,
with the agent using git update-ref to advance the initiative branch after
resolving conflicts. Also fixes stale diff/commits cache after resolution.

2026-03-06 11:40:22 +01:00

..

server

fix: Prevent conflict resolution agent from destroying initiative branch

2026-03-06 11:40:22 +01:00

web

fix: Prevent conflict resolution agent from destroying initiative branch

2026-03-06 11:40:22 +01:00