Error updating - local changes to compose.yml will be overwritten

Developer help Self-hosting
1

Ran into an issue this weekend when attempting to do an update. I figured I’d wait a few days to see if anyone else was having a similar issue, but since no one else is, I’m sure it’s something on my end.

/opt/ghost# git pull && docker compose pull && docker compose up -d
Updating fa605e9..2926758
error: Your local changes to the following files would be overwritten by merge:
compose.yml
Please commit your changes or stash them before you merge.
Aborting

Anyone seen this sort of behavior?

Thanks!
Bo

2

It looks like you might have made some customizations to the compose file. You can run git diff to see the changes. If you don’t care about the changes, you can run git checkout -- compose.yml to undo them, and then run your sync command again.

2 Likes
3

Ahhh, this is related to the last issue I had…

Thanks so much for your response!

-b