Hey Joseph, thank you for your help!
Yes, in part i have. In a gitignore-file, i had specified the following to be excluded:
I had done that weeks ago, but the files keep showing up in Git merge conflicts.
Don’t understand why.
Now after reading the links you provided, i have also added:
However, .user-folders weren’t the problem, it was FMODStudioCache.asset and fmod_editor.log who kept showing up in git merge conflicts. So i don’t think this will have solved the issue.
Also, what i don’t understand is files like these showing up in merge conflicts: