RE: index.html missing from repo master branch -- regen upon merges ?

Are there any other ways in which gh-pages is going to be different than master?  If so, we should also document these differences and the reasons for them.

                                                          -- Mike

From: Hodges, Jeff []
Sent: Thursday, April 7, 2016 2:50 PM
To: J.C. Jones <>
Cc: W3C WebAuthn WG <>
Subject: Re: index.html missing from repo master branch -- regen upon merges ?

thx JC -- overall the way it is setup sounds ok to me, we just ought to clearly document it in either or someother .md file :)

thx again and for setting this up,

On 4/7/16, 10:43 AM, "J.C. Jones" <<>> wrote:

The way I have Travis set up, it's always up-to-date on the gh-pages branch [1]. On the master branch it's somewhat dangerous to keep as it's very easy to cause merge conflicts on that file, prompting unexpected build failures. For that reason, index.html is in the .gitignore. This is the choice used in mt's i-d-template [2], which I used as the basis for our bikeshed CI tooling.  Note that the ACME spec [3] has this same deal, where the formatted version is only on the gh-pages branch.

It's possible to adjust the git commands in<> [4] to ensure that, in the event of a merge, the local copy always wins. In my experience that's a bit brittle to do it in a way that doesn't accidentally catch other files, but I'm happy to review and help test such a change.



On Thu, Apr 7, 2016 at 10:26 AM, Hodges, Jeff <<>> wrote:
Hubert & I notice that index.html missing from the<> repo master branch.

index.html is the "formatted" output gen'd by bikeshed.  if you have bikeshed installed, running  make in your repo clone directory will generate it. (ie, see the Makefile)

perhaps we should figure out a way that auto-generates index.html upon merges to master such that index.html tracks the current state of the post-merge(s) spec?


Received on Thursday, 7 April 2016 17:53:45 UTC