Development Workflow & Git
Matt & I split the development of the website into two sections: the aggregate pages, and the post pages. Aggregate pages use the thumbnail layout, where as post pages use their own layout. Despite splitting the workload we still needed to edit each others files while we were both working on them. Working on the same server would mean we'd overwrite each others code. To combat this we setup Git. Git is a version control system, the idea being it gives the user finite control over what goes into a file when two different versions of that file conflict. The way we used Git was to create a [repository on Github](https://github.com/ralphsaunders/BUlive-Wordpress), which would hold the latest conflict free version of the BUlive website. Matt would then fork this and work from his fork. When Matt had code that was ready to commit, I would pull his fork to my machine, diff it if we had conflicts and then resolve them, and then push to the master version on Github. While this may seem like a longwinded way to work, it's much better than overwriting each other's work. For the Wordpress theme, we created a child theme of Wordpress' default twentyeleven theme. This allowed us to use all the styles of their theme by default, but then overwrite them when it was necessary. This has the added benefit that when the next developers work on BUstation they don't have to understand how the entire theme works, just our extensions of the default theme, taking significantly less time.