Learning to use git and github

[nick]

Thanks for your replies! :)

"git pull upstream/master" doesn't work for me (fatal: upstream/master does not appear to be a git repository).

I'm working only on JSONSerialise branch. I've no idea what state my master branch is in - at this point I probably should reset it to be identical to JSONSerialise, then if I break JSONSerialise I can easily restore it. Will have to figure out what command to use.

I'm gradually getting the hang of git :)
I'm a bit confused as to the difference between "git pull upstream master" and "git pull upstream/master"? One web site (which I can't find now) suggested that the former refers to the "master" branch of the "upstream" repo, and the latter refers to a branch "upstream/master" in my local repo.

"git pull upstream master" (executed from JSONSerialise branch) seemed to work yesterday, so I'll give that a go.
I've made a zip backup of my local source and repo incase I break anything :)

[FluffyFreak]

oops, "git pull upstream master" no "/" between them :)

[nick]

Done. Pioneer builds, no linker errors.
Tested a save and load - uses JSON! :)
Pushed JSONSerialise to origin.
The force is with us :)

[impaktor]

"git merge upstream/master" is a valid command. Just states that it should merge in master from upstream int your current branch.

Done. Pioneer builds, no linker errors.

Awesome!