Hacker News Reader

As a neovim user who has to resort to vscode only for conflict solving, I'm curious: how do you handle conflicts without a GUI? No matter how hard I try, I can't seem to go even close to vscode's smart rebase, or sublime merge's conflict resolution ux, when I stay in the terminal.

View on HN

I feel your pain. I have to resort to the web for gitlab which is what we use for source control for really big conflicts.

But as a team we try to get everyone to merge often and are very long lived branches as code smells. This keeps changes small and conflicts small.

http://www.mdlerch.com/neovim-as-git-diff-and-merge-tool.htm...

Reply on news.ycombinator.com