Santosh Kumar Sharma SantoshNGitHub

## Git_mergetool_tutorial.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                SantoshNGitHub
                / Git_mergetool_tutorial.md
            
            
              Created
              July 14, 2019 07:40
                — forked from karenyyng/Git_mergetool_tutorial_with_Vim.md
            
              
                How to use `git mergetool` to resolve conflicts 
              
          
    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


## curl.md

      
              5 files
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                SantoshNGitHub
                / curl.md
            
            
              Created
              July 14, 2019 15:36
                — forked from subfuzion/curl.md
            
              
                curl POST examples
              
          
    Common Options

-#, --progress-bar
Make curl display a simple progress bar instead of the more informational standard meter.
-b, --cookie <name=data>
Supply cookie with request. If no =, then specifies the cookie file to use (see -c).
-c, --cookie-jar <file name>
File to save response cookies to.