4 Commits

Author	SHA1	Message	Date
Mika Kuns	1495c63e3d	fix(worker): return Blocked when MergeAbortAsync fails to avoid stuck repo ... If git merge --abort throws, the repo is left mid-merge. Previously the code logged a warning and returned a conflict result, giving the UI a stale file list. Now it returns Blocked with an explicit message so the caller knows manual resolution is required. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-22 10:30:44 +02:00
Mika Kuns	953d93179d	fix(worker): honour targetBranch in MergeAsync by checking out before merge ... Add GitService.CheckoutBranchAsync; compare targetBranch to current HEAD before MergeNoFfAsync and switch when they differ. Returns Blocked if the branch does not exist. Add three new tests (two service, one GitService). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-22 10:25:35 +02:00
Mika Kuns	3331c24898	feat(worker): implement TaskMergeService happy path	2026-04-22 09:37:35 +02:00
Mika Kuns	1c20d8f846	feat(worker): scaffold TaskMergeService with pre-flight checks	2026-04-22 09:36:16 +02:00