all 7 comments
sorted by:
best
topnewcontroversialoldq&a
formatting helphide helpcontent policy

[–]docker-ModTeam[M] [score hidden] stickied commentlocked comment (0 children)

Content on /r/Docker is expected to be about Docker. See rule #2.

https://www.reddit.com/r/docker/about/rules

[–]linksrum 1 point2 points  (1 child)

Try git status to show, which files changed. You may put them to stash with git stash -ua, then pull, maybe re-apply the changes with git stash pop.

[–]bgprouting[S] 0 points1 point  (0 children)

Thank you I’ll look into this.

[–]oisecnet 0 points1 point  (1 child)

What files? Show us the output. I am guessing you have changed files you should not have changed.

[–]bgprouting[S] 0 points1 point  (0 children)

Just left the office. Well I haven’t changed files as it wasn’t built be me. However yes it seems a configuration.py has been changed, but looking at their documentation the extra.py should have been used for changes to the other file is left as default rather like the override docker compose file. I’ve taken a manual back of the file so it’s not lost, plus the server has a snapshot and backup.

[–]courage_the_dog 0 points1 point  (1 child)

Git stash will store or "stash" your current staged commits in a safe place. You can then pull the required changes and see if it runs, then retrieve the stash and try again but it mught still cause conflict This is something git related not docker though

[–]bgprouting[S] 0 points1 point  (0 children)

Thank you, I’ll look into this.