pulling github back to local machine
Now that I had a clean slate in terms of my dev setup, I needed to pull my github changes back to my local machine. Currently my .git/config looked like this: [remote "origin"] url = https://github.com/hyperkitty/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master To pull my github changes (which I had forked from the main repo), I made these changes to .git/config: [remote "origin"] url = git@github.com:/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [remote "upstream"] url = https://github.com/hyperkitty/hyperkitty.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master With these changes,…Read more …