Take the pain out of Git conflict resolution: use diff3

This page summarizes the projects mentioned and recommended in the original post on news.ycombinator.com

Our great sponsors
  • Klotho - AWS Cloud-aware infrastructure-from-code toolbox [NEW]
  • Appwrite - The Open Source Firebase alternative introduces iOS support
  • InfluxDB - Access the most powerful time series database as a service
  • Sonar - Write Clean JavaScript Code. Always.
  • Visual Studio Code

    Visual Studio Code

    I personally never had to leave IntelliJ Idea for merge conflict resolution. So I am super used to it and think it is very convenient.

    [as far as I understand this is similar in philosophy to a diff3. True?]

    And while searching a bit, it seems that a similar UI is planned for VScode later in May 2022. Cf https://github.com/microsoft/vscode/issues/37350

    [Btw, a comment mentions that Sublime Merge already has a UI similar to the one in IntelliJ]

  • difftastic

    a structural diff that understands syntax 🟥🟩

  • Klotho

    AWS Cloud-aware infrastructure-from-code toolbox [NEW]. Build cloud backends with Infrastructure-from-Code (IfC), a revolutionary technique for generating and updating cloud infrastructure. Try IfC with AWS and Klotho now (Now open-source)

NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a more popular project.

Suggest a related project

Related posts