Git Merge Process WIP

## WIP DRAFT, IGNORE FOR NOW This will be a guide, showing team leaders how they may publish their changes to the master repository, as well as how they can update their team fork with the latest files in the master repository.

Must be careful, will be a pain to recover from errors. Only team leaders are to perform the following procedures.

---

Basics

http://gitref.org/

bash, change dir, cd, ls

git clone (First time)

git status, git add, git commit

add new files (git add .), commit (git commit -m 'message')

---

Setup Remotes

Git remote -v 'origin 'upstream create remote (git remote add upstream git@github.com:nordquip/sousms.git)

---

update team repository with parent changes

Need to sync main repo changes back down to team lvl

---

push team changes to parent

git fetch/pull from team

Do not change files here; if you want to change, commit and push to team. this is sync to parent only

update with parent (git pull upstream master)

Final test before pushing to parent.

push to parent (git push upstream master)