We are new to using source control , but have set up Sourcetree and bitbucket to collaborate on a small project. Mostly the commits, merges, and so forth are going fine but there is one .asset file (a low poly water asset) that just seems to change without the project members having touched it. This causes merge conflicts we are unsure how to resolve. We could I suppose simply ignore the file in gitignore as we are not trying to modify it but this seems like a bad solution. 1. Any idea on why an .asset file is rewriting itself from time to time? 2. How to stop it from doing so? 3. Absent 2, how to best work a file that changes itself into a source control workflow? Thanks in advance.