Anselmo Shim anselmoshim

## 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

## sublime-text-osx-context-menu.md

      
              1 file
            
          
              12 forks
            
          
              17 comments
            
          
              45 stars
            
          
                vincentmac
                / sublime-text-osx-context-menu.md
            
            
              Created
              September 25, 2013 18:03
            
              
                Sublime Text OSX Context Menu
              
          
    Add Sublime Text to OS X Context Menu


Open Automator
Create a new Service
Add a Run Shell Script action
Set input to Service receives selected files or folders in any application
Set the script action to /Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl -n $@
Set Pass input to as arguments
Save as Open in Sublime Text
	# 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