merge

Git Merge

• Git Merge
  • Solve conflict
    • Tools
    • Commands

Solve conflict

Tools

In nvim, I use plugin fugitive

Commands

open two vertical buffer (one form target, another from feature)

:Gvdiffsplit!

stay on middle and use

:diffget [buffername](local)

OR
go to target/feature buffer and use

:diffput [buffername](target/feature)

save the local file and use

:Git add .
:Git commit -m "solve merge conflicts"