Launches
Coming soon
Upcoming launches to watch
Launch archive
Most-loved launches by the community
Launch Guide
Checklists and pro tips for launching
Products
Shoutouts Leaderboard
The most-loved products on Product Hunt
Product Landscapes
AI notetakers
Compliance software
Hiring software
Password managers
Project management software
See more
Work & Productivity
Engineering & Development
Design & Creative
Finance
Social & Community
Marketing & Sales
AI
Health & Fitness
Travel
Platforms
Product add-ons
Web3
Physical Products
Ecommerce
Work & Productivity
AI notetakers
Ad blockers
App switcher
Calendar apps
Compliance software
Customer support tools
E-signature apps
Email clients
File storage and sharing apps
Hiring software
Knowledge base software
Legal services
Meeting software
Note and writing apps
PDF Editor
Password managers
Presentation Software
Product demo
Project management software
Resume tools
Scheduling software
Screenshots and screen recording apps
Search
Security software
Spreadsheets
Team collaboration software
Time tracking apps
Video conferencing
Virtual office platforms
Web browsers
Writing assistants
Engineering & Development
A/B testing tools
AI Coding Assistants
Authentication & identity tools
Automation tools
Content Management Systems
Cloud Computing Platforms
Code Review Tools
Code editors
Command line tools
Data analysis tools
Data visualization tools
Databases and backend frameworks
Git clients
Headless CMS software
Issue tracking software
Membership software
No-code platforms
Observability tools
Standup bots
Static site generators
Testing and QA software
Unified API
VPN client
Video hosting platforms
Web hosting services
Website analytics
Website builders
Design & Creative
3D & Animation
Background removal tools
Camera apps
Design inspiration websites
Design mockups
Design resources
Digital whiteboards
Graphic design tools
Icon sets
Interface design tools
Mobile editing apps
Photo editing
Podcasting
Social audio apps
Space design apps
Stock photo sites
UI frameworks
User research
Video editing
Wallpapers
Wireframing
Finance
Accounting software
Budgeting apps
Credit score tools
Financial planning
Fundraising resources
Investing
Invoicing tools
Money transfer
Neobanks
Online banking
Payroll software
Remote workforce tools
Retirement planning
Savings apps
Startup financial planning
Startup incorporation
Stock trading platforms
Tax preparation
Treasury management platforms
Social & Community
Blogging platforms
Community management
Dating apps
Link in bio tools
Live streaming platforms
Messaging apps
Microblogging platforms
Newsletter platforms
Photo sharing
Professional networking platforms
Safety and Privacy platforms
Social Networking
Social bookmarking
Video and Voice calling
Marketing & Sales
Advertising tools
Affiliate marketing
Best SEO tools
Business intelligence software
CRM software
Customer loyalty platforms
Email marketing
Influencer marketing platforms
Keyword research tools
Landing page builders
Lead generation software
Marketing automation platforms
Sales enablement
Sales training
Social media management tools
Social media scheduling tools
Survey and form builders
AI
AI Characters
AI Chatbots
AI Content Detection
AI Databases
AI Generative Art
AI Headshot Generators
AI Infrastructure Tools
AI Metrics and Evaluation
AI Voice Agents
Avatar generators
ChatGPT Prompts
LLMs
Predictive AI
Text-to-Speech
Health & Fitness
Activity tracking
Camping apps
Health Insurance
Hiking apps
Medical
Meditation apps
Mental Health
Senior care
Sleep apps
Therapy apps
Workout platforms
Travel
Flight booking apps
Hotel booking app
Maps and GPS
Outdoors platforms
Short term rentals
Travel Insurance
Travel Planning
Travel apps
Weather apps
Platforms
Crowdfunding
Event software
Job boards
Language Learning
News
Online learning
Real estate
Startup communities
Virtual events
Product add-ons
Chrome Extensions
Figma Plugins
Figma Templates
Notion Templates
Slack apps
Twitter apps
Wordpress Plugins
Wordpress themes
Web3
Crypto exchanges
Crypto tools
Crypto wallets
DAOs
Defi
NFT creation tools
NFT marketplaces
Physical Products
Books
Fitness
Furniture
Games
Toys
Wearables
Webcams
Ecommerce
Ecommerce platforms
Marketplace sites
Payment processors
Shopify Apps
AI sales tools
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
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
Blog
•
Newsletter
•
Questions
•
Forums
•
Product Categories
•
Apps
•
About
•
FAQ
•
Terms
•
Privacy and Cookies
•
X.com
•
Facebook
•
Instagram
•
LinkedIn
•
YouTube
•
Advertise
© 2025 Product Hunt
