Launches
Coming soon
Upcoming launches to watch
Launch archive
Most-loved launches by the community
Launch Guide
Checklists and pro tips for launching
Products
News
Newsletter
The best of Product Hunt, every day
Stories
Tech news, interviews, and tips from makers
Changelog
New Product Hunt features and releases
Forums
Forums
Ask questions, find support, and connect
Streaks
The most active community members
Events
Meet others online and in-person
Advertise
Subscribe
Sign in
Fix All Conflicts
Easy-to-use CUI for fixing git conflicts
•
0 reviews
•
2 followers
Visit website
Follow
Overview
Launches
Forums
Reviews
Team
More
Blog
•
Newsletter
•
Questions
•
Forums
•
Product Categories
•
Apps
•
About
•
FAQ
•
Terms
•
Privacy and Cookies
•
X.com
•
Facebook
•
Instagram
•
LinkedIn
•
YouTube
•
Advertise
© 2025 Product Hunt
What is Fix All Conflicts?
I never really liked any of the mergetools out there so I made a simple git mergetool that does simple things… in a simple fashion.
Do you use Fix All Conflicts?
I use this
I use something else
Recent Fix All Conflicts Launches
Fix All Conflicts
Easy-to-use CUI for fixing git conflicts
Launched on January 8th, 2018
3
99
Review Fix All Conflicts?
Leave a review
