Dev tools · alternatives · 2026
24 alternatives to Fix All Conflicts
Easy-to-use CUI for fixing git conflicts
Below are 24 products that do a similar job, ranked by how close each is in meaning and then by launch-day votes. Fix All Conflicts launched in 2018; newer entries below may have overtaken it.
- 1
Discover a powerful Git GUI Client for Mac, Windows and Linux, from the makers of Sublime Text. Line-by-line Staging. Commit Editing. Unmatched Performance.
2018 · sublimemerge.com · its alternatives →
- 2
- 3
- 4SM
Last year I gave in to the temptation of doing my own startup and quit my job, just like many others have done on this site. Since then, I’ve severely changed my lifestyle and reduced my living costs to a crazy low figure and worked my ass off for the last 8 months to achieve this: www.openloopz.com I have written more about it on Medium here: http://goo.gl/JN03yf I knew from the start the odds were stacked against me. I’m almost 36, I have a family and I live in the North East of England where - without wanting to sound negative - the opportunities are few and far between…
2015 · its alternatives →
- 5
I use interactive rebase quite often, and particularly like the editor bundled with IntelliJ. But I do not always work with IntelliJ, and am not 'fluent' with Vim, so I tried to replicate roughly the same rebase experience within a TUI. I used a small TUI OCaml project i made last year. The notable features are: - Move commits up and down, fixup, drop - Rename commits from the editor (without having to stop for a reword during the rebase run) - Visualize modified files along commits - 'Explode' a commit ,creating a commit for each modified file (a thing I found myself doing quite often)…
2024 · github.com · its alternatives →
- 6
I've always wanted a better way to explore the authorship data embedded in a Git commit log. I'm having fun building a CLI tool to do this. It's a bit like the "Contributors" tab on Github that shows you how many commits each contributor has made but much faster and with many more options. If you get a chance to try it out, please let me know. I'd love to hear feedback and suggestions. Thank you!
2025 · github.com · its alternatives →
- 7
Git Begin▲236Start contributing to open source projects with ease
2024 · gitbegin.theenthusiast.dev · its alternatives →
- 8
github-pewpew▲174Pew pew needless GitHub repos, clean up your repos via CLI
2022 · adrianmato.com · its alternatives →
- 9
JSON Query▲152On a recent screen share with our designer at my FT job, I watched as our designer struggled with checking out a repository. It was painful because existing Git clients are confusing and nearly user hostile. Us software engineers are used to Git and terrible UX, but it shouldn't have to be that way. So, I wanted to make something better. Been working on this one for a while now, and while it's still very early stages, it's stable enough that I feel comfortable sharing it with the world :) I wanted a few things to be really easy and clear: - Merging between branches is explained before you do…
2015 · satishmaha.com · its alternatives →
- 10
SnapCommit▲65Your AI Git sidekick that executes commands and fixes errors
Nov 2025 · snapcommit.dev · its alternatives →
- 11
GitItBack▲117See how your company stacks up against competitors on GitHub
2017 · netguru.com · its alternatives →
- 12
Split your patch similarly to `git add -p` but supporting multiple buckets - aleclearmind/split-patch
2022 · github.com · its alternatives →
- 13
Manage many git repos with sanity 从容管理多个git库. Contribute to nosarthur/gita development by creating an account on GitHub.
2019 · github.com · its alternatives →
- 14
Manage your work and collaborate with teammates.
2015 · fivesimplesteps.com · its alternatives →
- 15
Fork - a fast and friendly git client for Mac and Windows
2018 · git-fork.com · its alternatives →
- 16
Gut▲98An easy-to-use git alternative to version-control your code
2023 · gut-cli.dev · its alternatives →
- 17
Bump your git tag to the next version, easily. 👊
2018 · github.com · its alternatives →
- 18
- 19
Simple terminal based sequence editor for git interactive rebase. - sjurba/rebase-editor
2017 · github.com · its alternatives →
- 20
Cross-platform GUI for Git. Built with Monaco Editor and Electron. - adamsol/GitQuill
2024 · github.com · its alternatives →
- 21
Automate merge workflows for GitHub, manage queues in teams
2021 · mergequeue.com · its alternatives →
- 22
- 23RG
2022 · fdietze.github.io · its alternatives →
- 24
Also compare
Ranked by how close each launch is in meaning, then by votes. Prices were read from each product’s own site when checked and can change. Refine with your own description →