onesunone/Enlightened_Structure — pull request #2 by jacksenechal (2012-02-24 02:53:21+00:00)
Title: testing out master/gh-pages branches model

Hey I went ahead and broke out mine into two branches, and I invite you to do the same :) I'm suspecting that this pull request will create the master branch on yours, and you can then merge those changes into gh-pages, and then revert to your own links on that branch. Further merges from master I think will retain your customizations unless those specific lines are changed, so it should work fairly smoothly.

I'm pretty sure that the ignore model won't work, since we actually have to commit the changes. The other thing that might work would be some sort of customization script you could run, but that would mean those changes would go back and forth with every merge, which would be obnoxious. So the two-branch model is pretty clearly the technically correct way to go, if it's usable.