|
From: | Paul |
Subject: | Re: Staging not merging with master - make website fails |
Date: | Sat, 24 Sep 2016 09:02:07 -0400 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 |
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 would just do:
git checkout staging git reset --hard HEAD~ Would it work to just do: git checkout origin/staging git reset --hard HEAD~ I'll wait until I hear back before doing anything. Thanks again, -Paul On 09/24/2016 06:48 AM, James Lowe wrote:
Hello, commit 29941d96aa9942cfe914440b90b49ff7e015742e 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
[Prev in Thread] | Current Thread | [Next in Thread] |