This email is just to document/explain the branch shuffling that I recently did to facilitate the improved website workflow. Feel free to ignore if you don't care about the explanation for these force pushes.
Here's the explanation for each of the possibly non-obvious branch changes (and deletes and creates) in the accumulo-website repo that I recently performed. 1. asf-staging: this was a new branch I created to be the target for the Jekyll buildbot output; I had put some history there initially, copied from the old asf-site branch, but decided it wasn't necessary to keep any of that, since this is an entirely new branch. 2. asf-site-old-builds: this is a copy of the history from asf-site at its most recent commit; this is all generated content from manual Jekyll builds on the master branch (and the gh-pages branch before that), so I don't think we need to keep this, but it's there for now... we can delete it later 3. asf-site: after backing this branch up to asf-site-old-builds, I reset this branch's head to match the new asf-staging branch, to facilitate the improved workflow of simply updating the ref when we want to publish an automatically staged site (see README for details on that process) 4. tour-website: this was an old branch from ticket #43 that was already merged into the master branch a long time ago; there was no unique history in this branch to preserve that wasn't already in the master branch, so I deleted the branch That's all of them. If you haven't already, read my other email about the improved website workflow... I think it's neat.
