The Development Team met yesterday to reinforce our understanding of how to use GitHub to share our code and to try implementing some of the recommendations we received from the Design team with regard to our site. We established a list of rules for using Git that we are all committed to memorizing (or else we risk breaking branches, destroying the site, and creating extra work for ourselves). The rules are:
-
Pull before you push- any time we sit down to work on the code for the site we should remember to pull the code on each of our branches to ensure that we receive all the changes our colleagues have made and that we don’t end up with conflicts.
-
Don’t pull another branch into the Master branch- we want to keep the master branch clean!
-
Always check what branch you’re on whenever you make any changes (so that everyone else knows which branch to switch to when they are pulling the updates).
-
In order to delete other branches, you must be on the Master branch.
-
We don’‘t pull files- we’re only pulling code.
-
Don’t use capital letters or spaces in file names.
We also discovered, thanks to Alex and another colleague in the libraries, Seth Robertson’s choose your own adventure guides to Git, http://sethrobertson.github.
Once we had nailed down this set of rules to live and program by, we moved on to editing the CSS for our site’s homepage. We were able to insert a title into the header and to create a background image for the entire homepage. Our next steps will be centering the title, changing the font and size, and attempting to insert a navigation menu toward the bottom of the page. This all may sound very cryptic or, to those who are very familiar with coding and with Git, very basic, but having these rules crystallized has been extremely helpful for our team as we move forward in building the site.
(Our abstract and slightly insane visual understanding of how each member of the development team uses GitHub and connects to the Git repository)