Offer "After review" in the Merge dialog while a review runs

2026-10-16 22:34:14 -07:00
parent c2d0ff77d7
commit b28968a0bc
25 changed files with 835 additions and 292 deletions
@@ -343,6 +343,7 @@ func (m *Manager) MergeIntoParent(ctx context.Context, task api.Task, user api.U
 		}
 		return api.Task{}, err
 	}
+	m.clearMergeAfterReview(ctx, task.Id)
 	return m.store.GetTask(ctx, task.Id)
 }