brianolson/openscad — comment on commit 3d52f4c2d2a9d809eb2832ec6fc46ea5871e666c
File:  line 0
By clothbot:

Yeah, Marius put up with my own learning curve when I did the same. ;-)

If you happen to be on Mac I'd recommend getting familiar with GitHub's UI for managing your branches: https://github.com/blog/1067-github-for-mac-1-2-snow-octocat

You'll also probably want to alias the git fetch/merge/push set of commands anyway. I do it like this in my ~/.profile:

alias git_fetch_upstream='git fetch upstream'
alias git_merge_upstream='git merge upstream/master'
alias git_push_origin_master='git push origin master'