I just ran through the GitHub integration doc, including the GitHub bootcamp…thanks, and have everything all setup.
At the very end I wanted to run through the commands to get the latest code from the SmartThingsPublic repository even though I just set it up and it should already be updated. I am getting tripped up at the step to Push changes to my remote fork from my local repo.
I was able to run the following commands to update my local repo from the ST public repo:
git fetch upstream git checkout master git merge upstream/master
When I ran the checkout and merge it said I was already up to date, as expected.
While my current directory was the root of my local repo:
git push origin/master
C:\Users\Swindmiller\Documents\GitHub\SmartThingsPublic [master]> git push origin/master fatal: You are pushing to remote 'origin/master', which is not the upstream of your current branch 'master', without telling me what to push to update which remote branch.
git remote -v shows:
git remote -v origin https://github.com/swindmiller/SmartThingsPublic.git (fetch) origin https://github.com/swindmiller/SmartThingsPublic.git (push) upstream https://github.com/SmartThingsCommunity/SmartThingsPublic.git (fetch) upstream https://github.com/SmartThingsCommunity/SmartThingsPublic.git (push)
which looks right to me.
This is my very first experience with github so I am sure its just a stupid mistake on my end
This is a good way for me to learn GitHub