> On May 27, 2015, at 8:46 PM, Erik Weber <terbol...@gmail.com> wrote: > > Must admit I was a bit terrified when pressing enter on that git push :-) > > Btw, on master branch, should we push generated content, or just the source? >
I haven’t had time to think through it properly. so right now, every time I push on asf-site branch then I merge it in the master branch. i.e: commit…. ./build.sh git push git checkout master git merge asf-site if you develop on master and test on master…then commit middleman server git push git checkout asf-site git merge master ./build.sh as I said, did not think through it yet. we need a proper workflow, knowing that the live content is html in the content folder from asf-site branch. > > Erik > > Den onsdag 27. mai 2015 skrev Sebastien Goasguen <run...@gmail.com> > følgende: > >> >>> On May 22, 2015, at 10:37 PM, Jan-Arve Nygård <jan.arve.nyg...@gmail.com >> <javascript:;>> wrote: >>> >>> I also discovered that your previous corrections for the Dublin event was >>> lost. I created a new PR to correct it again. >>> >> >> Looks like awesome Erik Weber fixed and published… >> >> Having trouble with my ruby setup while on the road, sorry about that. >> >> But glad that Erik is able to push to the new site :) >> >>> -thinktwo >>> >>> 2015-05-22 18:39 GMT+02:00 Jan-Arve Nygård <jan.arve.nyg...@gmail.com >> <javascript:;>>: >>> >>>> Did you forget to commit the build? :) >>>> >>>> 2015-05-21 10:21 GMT+02:00 Jan-Arve Nygård <jan.arve.nyg...@gmail.com >> <javascript:;>>: >>>> >>>>> Thanks. Closed the PRs now. >>>>> >>>>> >>>>> 2015-05-21 9:43 GMT+02:00 Sebastien Goasguen <run...@gmail.com >> <javascript:;>>: >>>>> >>>>>> >>>>>>> On May 21, 2015, at 12:23 AM, Jan-Arve Nygård < >>>>>> jan.arve.nyg...@gmail.com <javascript:;>> wrote: >>>>>>> >>>>>>> 2015-05-13 10:06 GMT+02:00 sebgoa <run...@gmail.com <javascript:;>>: >>>>>>> >>>>>>>> >>>>>>>> On May 13, 2015, at 9:37 AM, Jan-Arve Nygård < >>>>>> jan.arve.nyg...@gmail.com <javascript:;>> >>>>>>>> wrote: >>>>>>>> >>>>>>>>> I created a PR to add committers that fell out of the list during >> the >>>>>>>> move. >>>>>>>>> I'm not sure if you want non committers to build with middleman and >>>>>> then >>>>>>>> do >>>>>>>>> a PR so i just created a PR against the source for the next build >>>>>> until >>>>>>>>> instructions are ready. >>>>>>>>> >>>>>>>> >>>>>>>> Merged. >>>>>>>> >>>>>>>> Thanks a lot. >>>>>>>> >>>>>>>> Feel free to improve the site ….it needs love :) >>>>>>>> >>>>>>>> >>>>>>> There are some PRs waiting if you haven't noticed. Nothing big, but >>>>>> the 404 >>>>>>> should be fixed. >>>>>>> It also seems there's no e-mail notifications to the mailinglist for >>>>>> this >>>>>>> repo? >>>>>>> >>>>>>> I will try to look through the site a bit more thoroughly later :) >>>>>> >>>>>> yeah, I need to fix the email for notifications, you are right it’s >> not >>>>>> coming to dev@ right now. >>>>>> >>>>>> I applied your patches and doing the build right now >>>>>> >>>>>> Can you close the PRs I forgot to do so. >>>>>> >>>>>> -sebastien >>>>> >>>>> >>>>> >>>> >> >>
