Entry tags:
Case conflict: Sinisteria.jpeg
I had some weird behavior on my computer (running Mac OSX), because we had an image file named Sinisteria.jpeg, and another named sinisteria.jpeg, so I committed a fix.
Depending on your OS, you may need to run an extra step next time you upgrade. You'll need this for Mac OSX for sure, I can't remember how Windows and Linux deal with case in filenames.
Pull in updates as usual. This will delete Sinisteria.jpeg (uppercase)
$ git pull
Updating ecc1d71..7cb6ab7
Fast-forward
htdocs/img/styles/paperme/Sinisteria.jpeg | Bin 786 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 htdocs/img/styles/paperme/Sinisteria.jpeg
Then check if you accidentally deleted sinisteria.jpeg (lowercase)
$ git status
# On branch develop
# Changes not staged for commit:
# (use "git add/rm..." to update what will be committed)
# (use "git checkout --..." to discard changes in working directory)
#
# deleted: htdocs/img/styles/paperme/sinisteria.jpeg
#
If you didn't see the "deleted: ..." bit, you're fine. No need to do anything more.
If you do see the "deleted:..." bit, then do this:
git checkout -- htdocs/img/styles/paperme/sinisteria.jpeg
Now check again to make sure that worked:
$ git status
# On branch develop
nothing to commit (working directory clean)
Done!
Depending on your OS, you may need to run an extra step next time you upgrade. You'll need this for Mac OSX for sure, I can't remember how Windows and Linux deal with case in filenames.
Pull in updates as usual. This will delete Sinisteria.jpeg (uppercase)
$ git pull
Updating ecc1d71..7cb6ab7
Fast-forward
htdocs/img/styles/paperme/Sinisteria.jpeg | Bin 786 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 htdocs/img/styles/paperme/Sinisteria.jpeg
Then check if you accidentally deleted sinisteria.jpeg (lowercase)
$ git status
# On branch develop
# Changes not staged for commit:
# (use "git add/rm
# (use "git checkout --
#
# deleted: htdocs/img/styles/paperme/sinisteria.jpeg
#
If you didn't see the "deleted: ..." bit, you're fine. No need to do anything more.
If you do see the "deleted:..." bit, then do this:
git checkout -- htdocs/img/styles/paperme/sinisteria.jpeg
Now check again to make sure that worked:
$ git status
# On branch develop
nothing to commit (working directory clean)
Done!
no subject
no subject
no subject
no subject
no subject
(I am preeeeeeetty sure it's my fault, because I patched all those themes initially)
no subject
no subject
no subject
no subject