Fix All Conflicts

What it does

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.

Easy-to-use CUI for fixing git conflicts. Contribute to mkchoi212/fac development by creating an account on GitHub.

• 
  Sublime Merge – A Git client from the makers of Sublime Text2018 · sublimemerge.com · ▲935

  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.

• 
  GIT.WTF!?!2019 · git.wtf · ▲117

  Figure out ways to fix GIT screw-ups

• 
  I made a git rebase TUI editor2024 · github.com · ▲115

  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)…

• 
  SnapCommitNov 2025 · snapcommit.dev · ▲65

  Your AI Git sidekick that executes commands and fixes errors

• 
  Version Control with Git2015 · fivesimplesteps.com · ▲64

  Manage your work and collaborate with teammates.

• 
  Fork – a fast and friendly Git client for Mac and Windows2018 · git-fork.com · ▲49

  Fork - a fast and friendly git client for Mac and Windows

• 
  /dev/null▲482

  a social network for devs

  Dev tools · 2d ago · dev-null.sh

• 
  Whiteboard (YC W26) – an open-source IDE for thoughtful software design▲423

  open-source IDE for thoughtful software design. Contribute to devdotfast/whiteboard development by creating an account on GitHub.

  Dev tools · 27d ago · github.com

• 
  Reladraw – A diagram language where you decide where to place things▲411

  Contribute to reladraw/reladraw development by creating an account on GitHub.

  Dev tools · 25d ago · github.com

• 
  OpenBot▲362

  Grok Bot alternative: free, local, open-source, multiplayer

  Dev tools · 22d ago · openbot.run

• 
  Talanoa▲343

  Hi HN, I’m a fullstack developer, and honestly, I’ve lost count of how many side projects I’ve worked on over the years. But one idea kept coming back to me: a different kind of email client. It first came to me in 2014: “What if we could handle emails more like conversations?” Every year, I’d revisit this concept in my “Build Notes.” Ten years later, no one had built exactly what I had in mind — so I finally decided to do it myself. That’s how Talanoa was born. I wanted something focused on people, not timelines. I was tired of marking messages as unread just to remember to reply later, or…

  Dev tools · 20d ago · talanoa.email

• 
  CoreSpeed▲332

  One MCP for everything your agents need: apps, memory, tools

  Dev tools · 28d ago · corespeed.io

• 
  Buy Me a Coffee▲1,411

  A simple, meaningful way to fund your creativity.

  Growth · 2018 · buymeacoffee.com

• 
  Robinhood Crypto▲1,208

  Zero-fee cryptocurrency trading from Robinhood 💸

  Commerce · 2018

• 
  Launchaco 2.0 🦄▲1,113

  Simple landing pages for your startup

  Dev tools · 2018

• 
  Indie Hackers Community▲1,095

  Work together to build profitable businesses & side projects

  Work · 2018 · indiehackers.com

• 
  Typeform 2.0▲793

  Build beautiful conversational forms, surveys and more

  Life & fun · 2018 · typeform.com

• 
  Resume.io▲731

  Build your job-winning resume in minutes

  Work · 2018 · resume.io