Stefan's Bastelkiste

Note to myself...

My changes should be Committed to my current master or AwesomeNewFeature branch

Add origin repo...

git remote add upstream http:// original repo.git

Get current version

git fetch upstream

Get my stuff back into working directory

git checkout master / AwesomeNewFeature

With some luck I can merge the upstream master with my branch

git merge upstream/master

Upload to Github

git push