Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Add TODO for duplicate merge-tree call on dirty worktrees (#2065)
Maximilian Roos5aaf622d2777
diff --git a/src/commands/list/collect/execution.rs b/src/commands/list/collect/execution.rsindex 808d13687..943d76b58 100644--- a/src/commands/list/collect/execution.rs+++ b/src/commands/list/collect/execution.rs@@ -231,6 +231,11 @@ pub fn work_items_for_worktree(TaskKind::UserMarker,TaskKind::WorkingTreeConflicts,TaskKind::BranchDiff,+ // TODO: For dirty worktrees, WorkingTreeConflicts already runs merge-tree+ // (via stash-create + merge-tree). MergeTreeConflicts duplicates that call+ // against HEAD. Could skip MergeTreeConflicts when WorkingTreeConflicts+ // produces a non-None answer, but needs result-ordering changes since both+ // tasks run in parallel today.TaskKind::MergeTreeConflicts,TaskKind::CiStatus,TaskKind::WouldMergeAdd,