Skip to content

Maintaining this project & merging Notes

Jump to bottom Edit New page
Adam Johnson edited this page Jan 14, 2014 · 2 revisions

Some notes for people who have commit access to this project:

There are two public branches to this project. The master branch and the scss branch. These two branches are mostly the same, so merging from master to scss is possible. Here's some quick documentation about that process:

  1. git pull, do work in the master branch, commit, and push. Tag a new version if necessary.
  2. Once work in the master branch is complete, checkout to the scss branch and git merge master.
  3. You'll probably have to sort out some merge conflicts (especially in places like _header.rhtml and README.md). Choose what changes you want to keep.
  4. Tag a new version if necessary.
  5. Push to scss branch.
Add a custom footer
Add a custom sidebar
Clone this wiki locally