mirror of
https://github.com/GreptimeTeam/greptimedb.git
synced 2026-11-18 16:54:09 +00:00
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 <shuxiachai@163.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: dennis zhuang <killme2008@gmail.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
dennis zhuang
parent
b30e002cef
commit
21ada9de09
@@ -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
|
||||
Reference in New Issue
Block a user