koobas.hobune.stream
Error CS8300 Why am I getting this merge conflict? Unity bug?
One day I wrote this script and next day I suddenly got a ton of this useless text appeared. When I try to revert to previous commit in GitHub it says that I have to merge and save changes, which I did many times, but everytime I save, it doubles the amount of this useless stuff
I've had a few issues with this before, in general I find this happens when I push code and still have the scene/main editor open. To fix the errors you should be able to just erase all of the HEAD markers and the other unrelated stuff.
