Anton z-vr

## ignore.md

      
        
          
            
              
              1 file
            
          
          
            
              
              0 forks
            
          
          
            
              
              0 comments
            
          
          
            
              
              3 stars
            
          
        
        
          
              
          
          
            
                z-vr
                / ignore.md
            
            
              Created
              February 3, 2017 23:55
                — forked from tmaybe/ignore.md
            
              
                ignoring merge conflicts for specific files in a git repository
              
          
        
      
        
  
      
    How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init it
$ mkdir merge-test
$ cd merge-test/
$ git init