News for hackers. Stuff that matters.

A comment on A work-in-progress Magit clone for Neovim. Parent comment

Re:A work-in-progress Magit clone for Neovim by ddek on Thursday July 08, 2021 @06:34AM (#27770250)
In general I agree, but one thing I've never learned is resolving merge conflicts in the CLI. I've always just used IDEA's merge resolution tools. Does CLI git provide any tools to help with merging?
[ Parent | on HN ]
Re:A work-in-progress Magit clone for Neovim by formerly_proven on Thursday July 08, 2021 @08:01AM (#27770823)
You resolve conflicts by staging the resolution and then continuing (rebase) or committing the result (merge, cherry pick). I generally just use git citool/gui for staging my resolutions, which I make in whatever editor I fancy.
[ Parent | on HN ]
Re:A work-in-progress Magit clone for Neovim by masklinn on Thursday July 08, 2021 @06:37AM (#27770269)
Beyond being able to open merge tools? No.
[ Parent | on HN ]