Show HN: Ec – a terminal Git conflict resolver inspired by IntelliJ

 (github.com)

18 pontos | por neozz 69 dias atrás

2 comentários

  • insane_dreamer
    68 dias atrás
    great stuff! would love to see this integrated into Lazygit, which I've found the best TUI git tool overall but doesn't have as good of a conflict resolution UX as you've done here (or JetBrains, which is the gold standard in GUI tools, IMO).
    [-]
    • neozz
      68 dias atrás
      I use Lazygit too! If you configure ec as git mergetool, you can resolve conflict via ec by open external mergetool in Lazygit.
  • az09mugen
    69 dias atrás
    Will look into that.
    [-]
    • neozz
      68 dias atrás
      Thanks!!