merge-engine 0.1.0

A non-LLM merge conflict resolver using structured merge, Version Space Algebra, and search-based techniques
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93

# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
#
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
# to registry (e.g., crates.io) dependencies.
#
# If you are reading this file be aware that the original Cargo.toml
# will likely look very different (and much more reasonable).
# See Cargo.toml.orig for the original contents.

[package]
edition = "2024"
name = "merge-engine"
version = "0.1.0"
build = false
autolib = false
autobins = false
autoexamples = false
autotests = false
autobenches = false
description = "A non-LLM merge conflict resolver using structured merge, Version Space Algebra, and search-based techniques"
readme = "README.md"
keywords = [
    "merge",
    "conflict",
    "git",
    "tree-sitter",
    "diff3",
]
categories = [
    "development-tools",
    "text-processing",
]
license = "MIT"
repository = "https://github.com/maceip/merge-engine"

[lib]
name = "merge_engine"
path = "src/lib.rs"

[[bin]]
name = "merge-engine"
path = "src/main.rs"

[[test]]
name = "ground_truth"
path = "tests/ground_truth.rs"

[dependencies.similar]
version = "2"

[dependencies.thiserror]
version = "2"

[dependencies.tree-sitter]
version = "0.25"

[dependencies.tree-sitter-c]
version = "0.23"

[dependencies.tree-sitter-cpp]
version = "0.23"

[dependencies.tree-sitter-go]
version = "0.23"

[dependencies.tree-sitter-java]
version = "0.23"

[dependencies.tree-sitter-javascript]
version = "0.23"

[dependencies.tree-sitter-kotlin-ng]
version = "1.1"

[dependencies.tree-sitter-python]
version = "0.23"

[dependencies.tree-sitter-rust]
version = "0.24"

[dependencies.tree-sitter-toml-ng]
version = "0.7"

[dependencies.tree-sitter-typescript]
version = "0.23"

[dependencies.tree-sitter-yaml]
version = "0.7"

[dev-dependencies.tempfile]
version = "3"