gistfile1.txt

# steps I took
 
$ git clone git@github.com:kjwierenga/rufus-scheduler.git
$ cd rufus-scheduler
$ git branch -a
* master
  origin/HEAD
  origin/master
  origin/twozero
$ git remote add upstream git://github.com/jmettraux/rufus-scheduler.git
$ git branch -a
* master
  origin/HEAD
  origin/master
  origin/twozero

# Changes made from here

$ git branch --track upstream/master upstream/master  # 1
$ git branch -a
  master
* upstream/master
  origin/HEAD
  origin/master
  origin/twozero
  upstream/master
  upstream/twozero

# So now you have a local tracking branch, time to merge

$ git checkout master
$ git checkout -b merge-branch
$ git merge upstream/master # <- git will moan about ambigious branch name, but will use the local tracking branch)

# hack away resolving conflicts

$ git checkout master
$ git merge merge-branch
$ git branch -d merge-branch

# to update and sync later

$ git checkout upstream/master
$ git pull
$ git checkout master
$ git rebase upstream/master