Shimmie instance suddenly returning 500 Internal Server Error after recent git commit/git pull

[Oui24]

Hello, my personal instance of shimmie2 is suddenly returning a 500 internal server error and refusing to load after using git pull to update. I'm not seeing a more detailed error anywhere on what specifically is causing this; all I know is I committed changes with git commit and then used git pull and then rebooted my server for unrelated updates. My actual website, the non-booru portion, is seemingly working fine as well, it is only the booru component.

[Oui24]

To also note, I was able to revert the commit and everything now works, so it WAS some oddity with updating - as my booru works fine, I don't need to update it, but I want to still mention this regardless in case there's potentially an issue this highlights like last time, so someone else doesn't run into it!

[shish]

Web server logs should have a more detailed error; without that, it's hard to have any idea what might have gone wrong :(

If you feel like a lot of effort, you could try bisecting to figure out exactly which change triggers the issue, tl;dr:

git bisect start
git bisect good         # mark the current commit as ok
git bisect bad main   # mark main as broken

(git will then move to a point half-way between the good and bad commits, you test it, run git bisect bad or git bisect good, repeat until you've narrowed it down to a single commit which introduced the problem)

[Oui24]

I apologize for not replying for a while, life got in the way - I managed to find the apache logs, not sure if those are exactly what you're looking for, but they give some of the following:
AH10244: invalid URI path
script '/var/www/oui24.me/index.php' not found or unable to stat
PHP Parse error: syntax error, unexpected token "<<" in /var/www/oui24.me/booru/index.php on line 71, referer: https://oui24.me/ - To note, I believe this may be an unrelated error
I'm not admittedly confident enough to try the bisect method yet, as the website DOES work without pulling, but I still wanted to send the logs I could find, in case they help?

[shish]

unexpected token "<<" suggests that you've made some custom changes, and git is confused because we've both changed the same file but in different ways, so it updates index.php to show both versions at the same time, looking something like

line 1
line 2
<<<<< one person changed "3" to "3a"
line 3a
=====
line 3b
>>>>> the other person changed "3" to "3b"
line 4
line 5

So you'll need to edit index.php to figure out if 3a or 3b is correct, remove the other one, and remove the merge-conflict markers

Alternatively I think git reset --hard origin/main should throw out any custom changes and bring you exactly in-sync with the current main branch (but it's been a while since I was in this specific situation ^^)

[Oui24]

Hm, I see. Weirdly now, it's saying everything is up to date without a problem when i go to do git-pull (even though I don't think it is...?), so I'll just keep this in mind to explore later on if it remains an issue - thank you!