git beginners

• start with this page: github set up - Attention: you don't have to remove your .ssh directory, you can use your existing keys
• refresh the code on your computer with the newest developments:
• git fetch upstream
• git merge upstream/master
• if you get a merge error: normally it is sufficient to do a git commit -a
• upload your developmet:
• git commit -a - give a comment in the opened file
• git push
• Pull Request: request that your commit will be merged into the master branch. Easiest way would be:
• open github.com
• login
• klick on your name
• search for your last commit ( pushed to master at ...)
• klick on the link
• klick "Pull Request"
• fill out form and submit pull request

Show differences:

• check what a git commit would upload / what did you do since your last commit: git diff
• check what a git merge upstream/master would do with the code on your computer: ???? (don't know yet... anyone?)