Re:Ask HN: What is your favorite tool to resolve Git merge c...
by jaycox2931 on Wednesday July 12, 2023 @09:50AM
(#36694505)
https://github.com/akinsho/git-conflict.nvim if you're into neovim
[ Parent
| on HN ]
There are no comments on this comment yet.