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

..

Config

feat(data,worker): add db schema init and signalr hub skeleton

2026-04-13 12:00:47 +02:00

Hub

feat(worker): expose MergeTask and GetMergeTargets on WorkerHub

2026-04-22 09:44:22 +02:00

Properties

chore(worker): tweak launchSettings

2026-04-21 15:56:14 +02:00

Runner

feat(worker): add WorktreeManager.DiscardAsync for task reset

2026-04-21 17:21:08 +02:00

Services

fix(worker): return Blocked when MergeAbortAsync fails to avoid stuck repo

2026-04-22 10:30:44 +02:00

appsettings.Development.json

chore(scaffold): add solution skeleton for App, Ui, Data, Worker and tests

2026-04-13 11:48:06 +02:00

appsettings.json

chore(scaffold): add solution skeleton for App, Ui, Data, Worker and tests

2026-04-13 11:48:06 +02:00

CLAUDE.md

docs: note ResetTask hub method and TaskResetService

2026-04-21 17:46:00 +02:00

ClaudeDo.Worker.csproj

fix(installer,worker): service hosting, dark theme, uninstall polish

2026-04-15 14:19:09 +02:00

Program.cs

chore(worker): register TaskMergeService

2026-04-22 09:43:34 +02:00