I merged it. I also made you a team member for the website so you should be able to push directly.
On Thu, May 15, 2014 at 8:50 AM, steph <[email protected]> wrote: > I just ran this and the commit worked just fine. I've submitted a pull > request for gh-pages to include the updates. The only addition I made was > to stop ignoring news/ in .gitignore on the gh-pages branch. > > Whoever has permissions can deploy and the news/ pages should be up there > now. > > And then Andrew can follow-up with additional news articles. > > Steph > > > > > > > > > On 05/14/2014 10:34 PM, Randall Leeds wrote: > > We should make one now, to generate the news directory. > I would, but I wanted to leave it to someone else so they could try it out > and make sure I was clear. > > ``` > $ cd _news > $ jekyll build > $ rake ghp > $ git push origin gh-pages:gh-pages > ``` > > > > On Wed, May 14, 2014 at 7:33 PM, Randall Leeds <[email protected]>wrote: > >> On Wed, May 14, 2014 at 7:02 PM, Steph Skardal <[email protected]>wrote: >> >>> Ok, I think I am following your updates now after rereading, Randall. >>> However, what this means to me is that every time a blog article is added, >>> there will be a commit in both the master branch and gh-pages branch that >>> would need to be pulled reflecting changes in the jekyll source and jekyll >>> destination files. This is fine, but it brings up a bit of an opportunity >>> for master and gh-pages to be unsynced if corresponding pull requests are >>> not made at the same time. I understand the motivations for keeping source >>> files out of the gh-pages branch, so I think doing it this way is fine >>> until it possibly becomes a headache. >>> Steph >>> >>> >> This is why I made the rake task. If you `rake ghp` then it will make a >> commit on gh-pages that brings it up to date. >> We don't need one for every single commit on master, just when we want to >> ship the site. >> >> The intention was also that the developer does not have to switch. Work >> entirely on master all the time. Run `rake ghp` from master and it >> generates a single commit on gh-pages that updates it completely. >> > > >
_______________________________________________ annotator-dev mailing list [email protected] https://lists.okfn.org/mailman/listinfo/annotator-dev Unsubscribe: https://lists.okfn.org/mailman/options/annotator-dev
