Best just to pull the master into your repository before pushing the result to Guthub.
Maybe I'm too lame with git.
If I clone jamespetts/master at home computer, do some changes and pull again, it will tell me to stash away my changes.
Maybe more step-by step guide would be useful.
So far I did:
- forked jamespetts (long time ago)
- made some branches for the particular improvements I wanted to do (smokes, slopes)
- cloned my repo to home computer
- did development (git commit + git push)
- now my master and branches are many commits behind james
- how do I pull james/master if my working clone is vladki/something ?