Wednesday, June 25, 2014

git - change branch to master

We have been preparing our blog to document our progress during RGSoC for what seems like an eternity.

First we wrote and entire blog from scratch in Sinatra. We realized that it really needed a lot of work to acquire all the capabilities that we wanted it to have. Stephanie found Nesta, a ruby CMS built with Sinatra. So we abandoned the work we had done and started on the new blog. It has been a few weeks now and it is almost ready. There are a lot of things you need to manually configure in Nesta.

Last night when we were working on it Steph pushed and broke the blog. I had pulled these changes into my master without realizing it. Luckily I had a branch that still worked properly so I changed that branch into the master and force pushed it with the help of these lovely and helpful directions. 
Thanks again stackoverflow.

No comments:

Post a Comment