Run the merge queue on a state-driven coordinator

2026-10-21 11:28:07 -07:00
parent a971cce9d6
commit 7fbdf1669a
13 changed files with 509 additions and 561 deletions
@@ -262,11 +262,7 @@ func (m *Manager) discardNow(ctx context.Context, taskID string) error {
 		return err
 	}
 	_, err = m.store.DiscardTask(ctx, task.Id, discard.By)
-	if err != nil {
-		return err
-	}
-	go m.releaseMerge(project.Id, task.Id)
-	return nil
+	return err
 }

 func (m *Manager) recoverDiscards(ctx context.Context) error {