Merging Paths

Meredith Levin, Nick Patterson, and Bob Scott in the Studio@Butler

Meredith Levin, Nick Patterson, Bob Scott and Sarah Witte (photographer) in the Studio@Butler



The developers had a great meeting this morning.  We went through Alex’s assignments, and are all up to speed on the first two, and close on the third. It has been a month since we’ve all met; it was good to be together again.

Assignment 1:

  • You should have a working version of Omeka running on your virtual servers independent of the one on GitHub. This includes a working MAMP or LAMP, a database, omeka software install, db.ini file configured.
  • Your git should be working and you should be able to synch with https://github.com/elotroalex/devlib.git

Assignment 2:

  • Someone change the readme.md page to reflect our project (rather than the Omeka boilerplate) and push it to github. Everyone else should pull it.
  • Someone create a branch named design and push it. Everyone should pull it.
  • Working on the design branch, someone change the background color on the style.css. Remember we are working with the default theme, called Thanks, Roy, so far. The style.css folder is to be found there. Push it. The rest pull.
  • This is a good opportunity for you to start understand how Omeka works in the back end. You can start by understanding Default Theme Files and Theme Writing Best Practices.

Assignment 3:

  • Put in an ‘issue’ on github. It doesn’t have to be real, but extra cookies for putting something down that we actually need to do eventually.
  • Create an item on your individual installations. Then backup the database.
  • Create a branch called playground, and break the site. Yes. Break it. Whoever breaks it first wins.

I am slowly getting a feel for Git.  At first, it was hard for me to parse the error messages.  I would search them verbatim on the internet, but then felt I was blindly typing in the suggested commands without understanding what I was doing.  The error messages and the excellent help pages on the Github site are now starting to make sense.   This morning we were all editing our style.css files pretty much at the same time, so I understand why I got error messages when trying to pull from the design branch.   I still need to work out the git sequences (add, commit, push, -m) to avoid the error messages, but I feel that it is coming.

unmerged paths

Sarah Witte

Author: Sarah Witte

As the Research and Collections Librarian for Gender & Women’s Studies I hope to build technical literacy in support of research in social history, especially involving census, GIS, textual data and primary resources. I am also interested in database design and architecture and the assessment of user interfaces.