[mh] git - synchronizing with hollie

[Jim D. <ji...@du...>]

I think I understand how to synchronize with the main hollie repository.
Please correct me if I am wrong.

Create my repository
	git clone https://github.com/jduda/misterhouse.git mh-git
	cd mh-git
Setup the insteon branch
	git checkout -b insteon origin/insteon

Add hollie remote repository

git remote add upstream https://github.com/hollie/misterhouse.git
git remote -v
origin	https://github.com/jduda/misterhouse.git (fetch)
origin	https://github.com/jduda/misterhouse.git (push)
upstream	https://github.com/hollie/misterhouse.git (fetch)
upstream	https://github.com/hollie/misterhouse.git (push)

Fetch commits from hollie
	git fetch

Merge changes into local insteon branch
	git merge upstream/insteon

Push them to my github repository
	git push origin/insteon

Switch to master branch
	git checkout master

Merge in changes from hollie master
	git merge upstream/master

Push them to my github repository
	git push

Back to insteon branch
	git checkout insteon

Now when I view github/jduda/misterhouse, I see changes made to hollie.

I'm now in sync with hollie.

Lather-rinse-repeat as desired.

Regards,

Jim