Merge conflicts when image cache is switched on

Git is asking me to to stash before merge when image cache is enabled. I ended up adding img (cached folder) to .gitignore but now I have an issue with images not loading in localhost.

Do you guys have a better workflow of dealing with cached images?

Answered by Philip Thygesen!
>>>>>>> Answered <<<<<<<
5 Replies