Search Unity

  1. Unity 2019.2 is now released.
    Dismiss Notice

.asset file changing in source control (Sourcetree, bitbucket)

Discussion in 'External Tools' started by ThySpektre, Sep 7, 2018.

  1. ThySpektre

    ThySpektre

    Joined:
    Mar 15, 2016
    Posts:
    247
    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.
     
  2. aurelien-morel-ubiant

    aurelien-morel-ubiant

    Joined:
    Sep 27, 2017
    Posts:
    235
    We have the same kind of trouble here. Have you find any solution ?
    ".spriteatlas" and ".asset" files seems to be modified without any reason.
    If we add them to the commit, they just vanished as if they have no modification...

    Quite weird, we thought to line ending issue but all our tries solved nothing :/
     
  3. ThySpektre

    ThySpektre

    Joined:
    Mar 15, 2016
    Posts:
    247
    We did not. In the end, we simply used a different asset.