One error in the “Merging back a fork” section. After the “git remote add …” command, you need to do a “git fetch gbdev”. Otherwise the “git branch gbdev-fork gbdev/master” command will give you a typically cryptic error that says “fatal: Not a valid object name: gbdev/master”.

Or you could use the -f parameter with the git remote add command to do it in one step.

– Ken