git merge strategy

gistfile1.txt

Pull in the latest commits:
$ git fetch

Rebase your branch on top of the remote master:
$ get rebase origin/master

Go back to master:
$ git checkout master

Fetch pulls down commits but doesn't apply them. So you need to put those commits on master:
$ git pull --rebase

Assuming no new commits were added between the time you rebased your branch to master and the above command then just:
$ git merge branch_name

Then push your shit up:
$ git push origin master

And delete your local branch:
$ git branch -d branch_name

And delete the remote branch:
$ git push origin :branch_name
...note the colon before your branch name, that basically says "push an empty reference to the branch", which deletes it.