WardCunningham/Smallest-Federated-Wiki — pull request #226 by hallahan (2012-05-11 20:02:46+00:00)
Title: got smarter with git

I did me some reading with git, and I have resolved our git confusing with the following procedure:

1. I forked your repo on github.
2. I cloned my github repo.
3. I fetched from the repo we were working on yesterday on my laptop.
4. I merged master with styling/master (the repo on my laptop).
5. I pushed to origin (my github).
6. I am making this pull request.