From 21ada9de0940c41ddda261b3080aa1a925983e6c Mon Sep 17 00:00:00 2001 From: Jingbo Chai Date: Mon, 16 Nov 2026 04:32:29 +0000 Subject: [PATCH] chore: remove stray merge-main.log (#10445) merge-main.log at the repository root holds the output of a `git merge` that stopped on conflicts in src/flow, followed by an `exit=1` line. It looks like it was committed by accident in 6fa375021 (#9171), and nothing in the repository references it. Signed-off-by: shuxiachai Co-authored-by: Claude Opus 5.5 Co-authored-by: dennis zhuang --- merge-main.log | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 merge-main.log diff --git a/merge-main.log b/merge-main.log deleted file mode 100644 index ec2af961861..00000000000 --- a/merge-main.log +++ /dev/null @@ -1,10 +0,0 @@ -Auto-merging src/flow/src/batching_mode/frontend_client.rs -Auto-merging src/flow/src/lib.rs -CONFLICT (content): Merge conflict in src/flow/src/lib.rs -Auto-merging src/flow/src/server.rs -CONFLICT (content): Merge conflict in src/flow/src/server.rs -Auto-merging src/operator/src/statement/ddl.rs -Recorded preimage for 'src/flow/src/lib.rs' -Recorded preimage for 'src/flow/src/server.rs' -Automatic merge failed; fix conflicts and then commit the result. -exit=1