feat(git): add ff-only merge and allow a merged worktree without merge commit

2026-10-01 11:25:47 +02:00
parent dc73f138d2
commit 724ad90f88
2 changed files with 9 additions and 1 deletions
@@ -36,7 +36,7 @@ public sealed class WorktreeRepository
            .ExecuteUpdateAsync(s => s.SetProperty(w => w.State, state), ct);
    }

-    public async Task SetMergedAsync(string taskId, string mergeCommit, CancellationToken ct = default)
+    public async Task SetMergedAsync(string taskId, string? mergeCommit, CancellationToken ct = default)
    {
        await _context.Worktrees
            .Where(w => w.TaskId == taskId)