This is primarily for my own reference, but it is an attempt to encapsulate the git workflow for working with repos being edited by other users.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
Setting the branch to track upstream:
In order to track the remote branch on the first push from that branch specify the
“-u” switch, i.e.
git push -u origin repo_branch
Forking / cloning a repository:
Make sure that you give your collaborator access to your repo from github.com
under settings. You will add them by their github user name. If you don’t their
git push will be rejected.
Error messages: Git is really good about telling you what went wrong, so read the error messages carefully.
Useful Resource: JohnWilliams.org: Git Command Essentials