chore: Revert the code from conflict resolution.

langgenius · Feb 21, 2025 · 12fb4fe · 12fb4fe
1 parent f0e5b52
commit 12fb4fe
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/api/core/workflow/graph_engine/entities/graph.py b/api/core/workflow/graph_engine/entities/graph.py
@@ -590,6 +590,8 @@ def _fetch_all_node_ids_in_parallels(
                             start_node_id=node_id,
                             routes_node_ids=routes_node_ids,
                         )
+                        # Exclude conditional branch nodes
+                        and all(edge.run_condition is None for edge in reverse_edge_mapping.get(node_id, []))
                     ):
                         if node_id not in merge_branch_node_ids:
                             merge_branch_node_ids[node_id] = []