Question by Lohoris2 · Oct 31, 2013 at 01:39 PM · version-control 4.2 4.3.3

Unity's version control conflicts between 4.2 and 4.3

A collegue upgraded Unity to 4.3 and pushed a few commits, now I'm trying to update with Unity 4.2 and one of the commits gets partially stuck: it worked, except one single file which still has to be updated, counting as "new".

The file is Physics2DSettings.asset, apparently residing in the ProjectSettings directory.

I've tried many things, such as:

discarding my changes
updating to a previous version and updating again to the latest
manually creating an empty file with that name
manually copying that file from one pc to another one

none of those worked, that commit is still stuck.

Meanwhile I can push and pull new commits anyway, I'll just still see that commit among the pending updates.

Is there a workaround?

Add comment · Show 2

yoyo · Mar 13, 2014 at 07:44 PM 0

The Unity Editor seems to like to change Physics2DSettings.asset on an almost continuous basis. I get prompted to save it with every scene modification (in Unity 4.3.4f1).

hansthered · Jun 22, 2014 at 01:02 AM 0

I'm having the same issue, this file continues to change 3 days after I closed unity... why is this happening? Each time I commit the file changes and I can never sync my directory unless I ignore changes to the file using github.