From 24d80000acb78d1ed46388ed3b68c8807e9a49ef Mon Sep 17 00:00:00 2001 From: Novice <857526207@qq.com> Date: Tue, 4 Mar 2025 11:21:16 +0800 Subject: [PATCH] chore: Restore the parts that were overwritten during conflict resolution. (#14141) --- api/core/workflow/graph_engine/entities/graph.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/api/core/workflow/graph_engine/entities/graph.py b/api/core/workflow/graph_engine/entities/graph.py index 1c6b4b6618..5c672c985b 100644 --- a/api/core/workflow/graph_engine/entities/graph.py +++ b/api/core/workflow/graph_engine/entities/graph.py @@ -590,8 +590,6 @@ class Graph(BaseModel): 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] = []