(remember to reply-to-all) On Sat, Jul 20, 2013 at 4:19 AM, Paul Dragoonis <[email protected]> wrote: > > > > On Fri, Jul 19, 2013 at 7:39 PM, Hannes Magnusson > <[email protected]> wrote: >> >> On Sat, Jul 13, 2013 at 2:37 PM, Levi Morrison <[email protected]> >> wrote: >> > Dear list, >> > >> > I've been really bad about communicating my work on the php.net beta >> > site; >> > I'm sorry. This email is intended to give a vision of what I think still >> > needs to be done before we can go live. The responsive branch of the >> > php-web repository houses the work I've been doing. It's up-to-date with >> > everything I've done except for adding some content on the homepage; >> > I'll >> > get that back up in the next day or two. >> >> >> I'm a littlebit afraid of the branches diverging from eachother, so >> the sooner it'll be merged back into master the better. >> >> In the meanwhile, I can't see a that branch live anywhere.. Do you >> want to switch prototype.php.net to the "responsive" branch? > > > Hi Hannes / Levi, > > How about we have a 'preview' branch, and prototype will pull against that. > > This way we can actually push changes up to prototype.php.net and see them > in 'preview mode' before we commit to merging into master. > > It allows for some review and feedback of changes before we go fully live > and potentially break things.
In general I prefer inline versioning then branches for this, as you can see we have branches dating back to 2008 which just become dormant or to difficult to merge. Also, what would be the difference between the responsive branch and the preview one? Posting screenshots along with patches to explain the idea has worked pretty well.. -Hannes -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
