git-conflict-resolver
Version:
A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.
| Filename | Content Type | Size | |
|---|---|---|---|
| ../ | |||
| 3.58 kB | |||
A rules-based JSON conflict resolver that parses Git conflict markers, reconstructs ours/theirs, and merges with deterministic strategies — beyond line-based merges.
| Filename | Content Type | Size | |
|---|---|---|---|
| ../ | |||
| 3.58 kB | |||