Open NickAtAccuPS opened 7 years ago
Thanks for the link, I'll get the git ignore and such in place, once I push the latest build, most likly soemtime tonight.
Heads up the commits are still identifying previously binary files as binary even though they've switched to text. I know there's a way to fix it, but I drew a blank last time I tried to look it up. Right now though previous prefabs, scenes, etc would not be merge-able.
hmm, I just pushed a commit where i updated the git ignore, switch meta files to visable and turned off unity collaborate. Let me know if this works.
I was using unity collaborate for a little bit, but it seems to conflict with the meta files and makes them hidden. But im not super sure about the merging. I know using unity collaborate I have yet to get automaticly merging working.
The issue is actually with Git, not Unity. Once a file is tracked as a binary file it wants to continue tracking it as a binary file. I'll see if I can't find the fix, it's pretty easy from what I remember but always a pain to find.
Here's a quick example of the files I'm talking about for reference.
Edit: So the actual problem seems to be that Github is showing files as binary when they're recognized as text in git, at least that's the best explanation I can come up with at the moment. Things seem to be diffing correctly when I manually modified one of the "binary" prefab files.
Hmm today I also learned that unity change the way sterilization works in 5.5 which means it's not possible to go back and rebuild a project in 5.4 once it upgrades to 5.5 I wonder if this is a part of the issue.
I guess it's time to push forward. https://forum.unity3d.com/threads/downgrading-unity-5-5-to-5-4-causes-failures-in-scenes-and-prefabs.436684/
You should be able to roll back to 5.5 since it's in git, but it does sound like it's a much larger hassle now than it was before.
This Gamasutra article outlines how to set up the Unity project to be more Git friendly. You'll probably want to make this transition in a unique commit with no other changes. I'd do it myself but I didn't want to stomp on any changes you'd potentially have made.