4 Commits

Author	SHA1	Message	Date
mika kuns	62106ff644	feat(worker): add ContinueMergeAsync to resume a conflicted merge ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 15:17:57 +02:00
mika kuns	e77ba35b0e	feat(worker): add leaveConflictsInTree option to TaskMergeService.MergeAsync ... Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-04-24 15:06:33 +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	1c20d8f846	feat(worker): scaffold TaskMergeService with pre-flight checks	2026-04-22 09:36:16 +02:00