Alternatives
Products that do what Fix All Conflicts does
Easy-to-use CUI for fixing git conflicts
- 1

- 2

- 3

- 4

- 5GT
2017 · gitorials.com
- 6

- 7

- 8GA
2019 · github.com
- 9

- 10

- 11GB
2020 · github.com
- 12

- 13RE
2017 · github.com
- 14

- 15

- 16

- 17ET
ec (easy-conflict) is a 3-way terminal native Git merge conflict resolver. Supports diff3 base comparison, and helps you resolve merge conflicts faster without leaving the terminal.
Apr 2026 · github.com
- 18

- 19

- 20GA
2019 · github.com
- 21

- 22

- 23RG
2022 · fdietze.github.io
- 24

Ranked by how close each launch is in meaning, then by votes. Refine with a description →