merging-master.sh

# Prereq: Current branch is the feature branch and all pending changes are committed locally

# First pull down the changes from master
$ git checkout master
$ git pull

# Then, go back to the feature branch and merge in master
$ git checkout my-feature
$ git merge master

## If there are merge conflicts, open up the files and resolve them
$ git add .
$ git commit -m "Merge in master"

## Push the feature branch to GitHub
$ git push