NHacker Next
  • new
  • past
  • show
  • ask
  • show
  • jobs
  • submit
Show HN: Ec – a terminal Git conflict resolver inspired by IntelliJ (github.com)
insane_dreamer 2 days ago [-]
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 2 days ago [-]
I use Lazygit too! If you configure ec as git mergetool, you can resolve conflict via ec by open external mergetool in Lazygit.
az09mugen 3 days ago [-]
Will look into that.
neozz 3 days ago [-]
Thanks!!
3 days ago [-]
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact
Rendered at 14:45:29 GMT+0000 (Coordinated Universal Time) with Vercel.