Benedict Etzel beheh

## awesome-php.md

      
              1 file
            
          
              264 forks
            
          
              88 comments
            
          
              1425 stars
            
          
                ziadoz
                / awesome-php.md
            
            
              Last active
              April 17, 2024 21:06
            
              
                Awesome PHP — A curated list of amazingly awesome PHP libraries, resources and shiny things.
              
          
    Awesome PHP

Awesome PHP has been relocated permanently to its own Github repository. No further updates will made to this gist.
Please open an issue for any new suggestions.

  
## vimdiff.md

      
              1 file
            
          
              97 forks
            
          
              22 comments
            
          
              574 stars
            
          
                mattratleph
                / vimdiff.md
            
            
              Last active
              March 27, 2024 10:04
                — forked from roothybrid7/vimdiff_cheet.md
            
              
                vimdiff cheat sheet
              
          
    vimdiff cheat sheet

##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)