How to do a git merge?

This page summarizes the projects mentioned and recommended in the original post on /r/neovim

Our great sponsors
  • WorkOS - The modern identity platform for B2B SaaS
  • InfluxDB - Power Real-Time Data Analytics at Scale
  • SaaSHub - Software Alternatives and Reviews
  • diffview.nvim

    Single tabpage interface for easily cycling through diffs for all modified files for any git rev.

    Diffview.nvim

  • vim-mergetool

    :cake: Efficient way of using Vim as a Git mergetool (by cynix)

    Let me recommend https://github.com/cynix/vim-mergetool (fork of original tool by samoshkin). Has been a huge help for me

  • WorkOS

    The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.

  • vim-fugitive

    fugitive.vim: A Git wrapper so awesome, it should be illegal

    I highly recommend fugitive by tpope as u/SunnyNickname said. For me, it's probably one of my top 5 plugins I couldn't live without. As for the git merge, you can see it in action at http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/.

NOTE: The number of mentions on this list indicates mentions on common posts plus user suggested alternatives. Hence, a higher number means a more popular project.

Suggest a related project

Related posts