Fix All Conflicts Forums on Product Hunt | Product Hunt

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

Sign in

Home Recent comments Search all threads Start new thread

Topic Forums

p/vibecoding Forum AMA category

p/introduce-yourself Forum Self-Promotion category

p/self-promotion

Product Forums

p/kanbanq-open-alpha Product Hunt

p/windsurf Okibi

p/warestack Bolo

p/augment-code Equip

p/polite-ai Atlas

p/claude-for-desktop

p/openwispr-open-source-ai-speech-to-text Claude by Anthropic

p/claude-code Wispr Flow

Fix All Conflicts

p/fix-all-conflicts Easy-to-use CUI for fixing git conflicts

•

•

1 follower

Start new thread

•

7yr ago

Fix All Conflicts - Easy-to-use CUI for fixing git 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.

Sign in