I've broken something

[matthewcrisp]

Trying to deploy with a whole load of new djembes for the website and keep coming across this error when running

$ git subtree push --prefix website/dist origin gh-pages

src and dist folders are in sync, both on my harddrive and on github. There's a discrepancy between those and my gh-pages branch. The issue is at assets/img/slides/vertical/ That's how it should be. On gh-pages it's assets/img/slides/Vertical/ and that capital V is stopping the images in that folder displaying on the page. I can't find a way to edit my gh-pages branch!

[matthewcrisp]

$ git pull doesn't help and nor does the deploy command with pull instead of push, although the latter did 'merge' the affected files. Nothing actually changed though.

[danielcrisp]

That error message normally means you just need to do $ git pull

If you've done that and it looks like everything is up to date locally then perhaps you need to do a force push using the -f flag:

$ git subtree push -f --prefix website/dist origin gh-pages

[matthewcrisp]

I've tried both those things. Git pull says everything is up to date, but then the deploy command still throws up an error.

I've tried -f and --force in the deploy command but the syntax is wrong; subtree push doesn't recognise either.

I googled it and people are suggesting splitting and rejoining the gh-pages branch. Thought I'd ask you before trying it though; it sounds scary!

On 25 Apr 2016, at 09:32, "danielcrisp" notifications@github.com wrote:

That error message normally means you just need to do $ git pull

If you've done that and it looks like everything is up to date locally then perhaps you need to do a force push using the -f flag:

$ git subtree push -f --prefix website/dist origin gh-pages

— You are receiving this because you authored the thread. Reply to this email directly or view it on GitHub

[danielcrisp]

Right, I've pushed an update to your Gruntfile

Some people with the same problem have recommended a special build tool. I've just tried it and it seems to work, but it says I don't have any changes - so really you need to try it.

This is what you need to do:

$ git pull
$ cd website
$ npm install

Then when you want to build and deploy your site just run this command:

$ grunt deploy

No more subtree nonsense

Let me know if it works

[matthewcrisp]

Done, thank you!!

It still wouldn't let me change the folder name from image/slides/Vertical to image/slides/vertical for some reason, but it's let me change vertical to Vertical in the json file, so it works now, but it feels a bit janky.

[danielcrisp]

Have you tried this?

http://stackoverflow.com/questions/6899582/i-change-the-capitalization-of-a-directory-and-git-doesnt-seem-to-pick-up-on-it