Sean Stephenson SeanPlusPlus

## gist:6f6bd45844f5956babff

      
        
          
            
              
              1 file
            
          
          
            
              
              0 forks
            
          
          
            
              
              0 comments
            
          
          
            
              
              0 stars
            
          
        
        
          
              
          
          
            
                SeanPlusPlus
                / gist:6f6bd45844f5956babff
            
            
              Last active
              August 29, 2015 14:16
                — forked from dlbewley/gist:a062df2612fb1e4b7e5f
            
              
                how to merge from upstream
              
          
        
      
        
  
      
    How do I get changes from Sean's sweet repo?
git remote add upstream git@github.com:SeanPlusPlus/WebDevTemplates.git
git fetch upstream
git checkout master
git merge upstream/master

Beware of conflicts