W3C home > Mailing lists > Public > public-html-media@w3.org > May 2016

Re: Using GitHub's merge button

From: Philippe Le Hegaret <plh@w3.org>
Date: Thu, 12 May 2016 18:14:51 -0700
To: Mark Watson <watsonm@netflix.com>
Cc: "Jerry Smith (IEP)" <jdsmith@microsoft.com>, David Dorwin <ddorwin@google.com>, Matt Wolenetz <wolenetz@google.com>, "public-html-media@w3.org" <public-html-media@w3.org>
Message-ID: <57352A8B.2080704@w3.org>


On 05/12/2016 06:10 PM, Mark Watson wrote:
>
>
> On Thu, May 12, 2016 at 5:50 PM, Philippe Le Hegaret <plh@w3.org
> <mailto:plh@w3.org>> wrote:
>
>
>
>     On 05/12/2016 05:25 PM, Jerry Smith (IEP) wrote:
>
>         We all create a branch for each PR so that subsequent commits
>         are isolated to the issue they are working.
>
>
>     Yes, of course.
>
>           Is it okay to rebase in these (git rebase gh-pages)?
>
>
>     Not sure what you mean here. In my proposal, the history of commits
>     is maintained on the master branch and the gh-pages branch only
>     contains the automatically generated draft, so no need to rebase
>     anything there.
>
>     Having said that, such change at the moment could be disruptive to
>     you folks so I'd rather not touch the branches until you folks want
>     me to squash btw. Just give me the word and I'll do it.
>
>
> ​We are treating gh-pages as our master branch (at the moment). We have
> no branch called "master".

Yep, I'm aware of that. I sense that I'm creating more confusion than 
actually helping here. So forget my proposal for now. I could always 
come back to it later when you guys have less pressure and I could 
express myself more clearly.

Philippe
Received on Friday, 13 May 2016 01:14:55 UTC

This archive was generated by hypermail 2.3.1 : Friday, 13 May 2016 01:14:55 UTC