On 09/24/2016 12:55 PM, Phil Holmes wrote:
And by the wonder that is the website build, you'll see that
lilypond.org is already showing the new front page.
Indeed! Very nice.
One problem... the news page is redirecting to the home page because the
htaccess file here:
- Original Message -
From: "Paul" <p...@paulwmorris.com>
To: "Phil Holmes" <m...@philholmes.net>; <lilypond-devel@gnu.org>
Sent: Saturday, September 24, 2016 3:23 PM
Subject: Re: Staging not merging with master - make website fails
On 09/24/2016
On 09/24/2016 09:56 AM, Phil Holmes wrote:
I think you will definitely have to back out the current commit, add
the images and repush to staging. My notes on how to do this:
Thanks Phil! That worked. My new patch is now pushed to staging with
the images added (commit message is the same
e: Staging not merging with master - make website fails
Hello James,
Thanks for your message. I was wondering what had gone wrong... What's
the best way to fix things from here? Should I back out my commit on
staging and redo the push with a new patch with images included? I'm not
sure ho
Hello James,
Thanks for your message. I was wondering what had gone wrong... What's
the best way to fix things from here? Should I back out my commit on
staging and redo the push with a new patch with images included? I'm
not sure how to back out a commit on a remote branch... Locally I
Hello,
commit29941d96aa9942cfe914440b90b49ff7e015742e
>From Paul is missing its image files - they have been uploaded into
LilyPond Extra but need to be included in this commit in staging.
Regards
--
--
James
___
lilypond-devel mailing list
