Unity file conflicts - Githubissues

simeonradivoev / UniGit

An open source GIT Unity3D editor plugin.

GNU General Public License v3.0

143 stars 16 forks source link

Open simeonradivoev opened 8 years ago

simeonradivoev commented 8 years ago

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

HeadClot commented 7 years ago

Has this been worked on since it was posted?

simeonradivoev commented 7 years ago

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