git conversion in progress

Jakub Jelinek
Wed Jan 15 00:32:00 GMT 2020

On Tue, Jan 14, 2020 at 06:06:36PM +0000, Joseph Myers wrote:
> On Tue, 14 Jan 2020, Jason Merrill wrote:
> > I notice that git.html on the website doesn't match what's currently in
> > wwwdocs git, is automatic updating broken?
> /www/gcc/wwwdocs-checkout/cgi-bin/gcc-gitref.cgi had local changes 
> (committed, but not reverted in that checkout before they were committed), 
> thereby breaking automatic updates:
> error: Your local changes to the following files would be overwritten by merge:
>         cgi-bin/gcc-gitref.cgi
> Please commit your changes or stash them before you merge.
> Aborting
> I've now reverted that and updated that checkout and am running 
> update_web_docs_git which preprocesses the whole website among other 
> things.

Oops, sorry for that, forgot to remove those after I was done with testing


More information about the Gcc mailing list