Comments (6)
Thanks for the link, I'll get the git ignore and such in place, once I push the latest build, most likly soemtime tonight.
from openbrushvr.
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.
from openbrushvr.
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.
from openbrushvr.
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.
from openbrushvr.
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/
from openbrushvr.
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.
from openbrushvr.
Related Issues (4)
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from openbrushvr.