Anzumana Taal Anzumana

## Git_mergetool_tutorial_with_Vim.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                Anzumana
                / Git_mergetool_tutorial_with_Vim.md
            
            
              Created
              March 28, 2023 11:34
                — forked from karenyyng/Git_mergetool_tutorial_with_Vim.md
            
              
                How to use `git mergetool` to resolve conflicts in Vim / NeoVim
              
          
    Table Of Content

Skip to the relevant sections if needed.

2-min tutorial to do it the quick-and-dirty-way
Concepts for resolving Git conflicts
Setting up different editors / tool for using git mergetool

Finding out what mergetool editors are supported


mergetool simple code example for vimdiff

Resolving conflict from a Git pull


Other great references and tutorials


## grab links.bookmarklet
javascript:(function(){var p=document.createElement("p");p.innerHTML="<strong>Loading&hellip;</strong>";p.id="loadingp";p.style.padding="20px";p.style.background="#fff";p.style.left="20px";p.style.top=0;p.style.position="fixed";p.style.zIndex="9999999";p.style.opacity=".85";document.body.appendChild(p);document.body.appendChild(document.createElement("script")).src="https://gist.github.com/ttscoff/5834741/raw/grablinks.js?x="+(Math.random());})();