You can resolve merge conflicts using a combination of fugitive's :Gdiff command, and Vim's built in diffget and diffput .
確定! 回上一頁