New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unity file conflicts #4

Open

3 tasks

simeonradivoev opened this issue Oct 8, 2016 · 2 comments

Labels

Feature

Owner

simeonradivoev commented Oct 8, 2016 •

edited

Loading

Add support for conflict resolvement for Unity files like prefabs, scenes or materials

Scene files
Prefabs
Materials

simeonradivoev added the Feature label

HeadClot commented Oct 3, 2017

Has this been worked on since it was posted?

Owner Author

simeonradivoev commented Oct 3, 2017

Not really. I've mainly got around it using unity's awful smart merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment