araxis merge git difftool couldn't save file

/ProjectSettings/AudioManager.asset - can't add existing file (level 48) Any help would be so appreciated! We absolutely need version control and Perforce integrated seems so perfect but it is not working for us (and might I add the manual is not helpful!).Įvery time I start up my project, I see an info message saying that all the ProjectSettings. We're not horribly technically proficient. Perforce says it has successfully updated, but those assets are still marked new. They are trees, shrubs, etc.- nothing too important. Why would this be? Is there any way to use this guy we paid $40 for? He works just fine locally within the game.Īlso, some files are not ever clearing the local workspace as updated even when they have been several times.

We've deleted him and redownloaded him, reinstalled Unity, etc. The error we get is 'Failure while writing asset stream operation timed out.' All 4000 other files work fine. We (3 of us on project) have one asset, a priest, that we bought from the asset store that will crash the update every time we try to commit him.

I'm using the Perforce version control built in to Unity 4.6 through the Pro license.

Araxis merge git difftool couldn't save file