Edvins Antonovs ummahusla

## git-overwrite-branch.sh
# overwrite master with contents of feature branch (feature > master)
git checkout feature      # source name
git merge -s ours master  # target name
git checkout master       # target name
git merge feature         # source name

## A-Pen-by-usf.markdown

      
        
          
            
              
              3 files
            
          
          
            
              
              0 forks
            
          
          
            
              
              0 comments
            
          
          
            
              
              0 stars
            
          
        
        
          
              
          
          
            
                ummahusla
                / A-Pen-by-usf.markdown
            
            
              Created
              September 3, 2013 09:04
                — forked from anonymous/A-Pen-by-usf.markdown
            
          
        
      
        
  
      
    A Pen by usf

inspired by http://dribbble.com/shots/1219202-Drag-Drop-User-Interface
A Pen by usf on CodePen.
License.
	# overwrite master with contents of feature branch (feature > master)
	git checkout feature # source name
	git merge -s ours master # target name
	git checkout master # target name
	git merge feature # source name