Situation:
Unity project in GIT, working 100% fine.
Problem:
Resolving GIT conflicts generates .orig files in Asset folder. Unity then imports these .orig files and clutters my project, producing extra .meta files too.
Desired Solution:
Blacklisting .orig files from being imported by Unity. Or some method/solution that doesn’t involve disabling .orig backups in my diff software.
I’ve searched the forums and found one other user asking the same question in 2010, but never got a reply.
Thank you for your time.
After a day of research, I’ve come up with a really poor solution, it doesn’t fix already imported files automatically though.
Go to your preferences and disable ‘Auto Refresh’
From now on, assets won’t auto-import, or even show up in unity. You have to do the following:
Right click in your project viewer and select ‘Import New Asset…’ This will give you the power to control what is imported and what is not.
If you have unwanted files, you need to move your entire assets folder out of unity and re-import all to clear out your project viewer. Then manually import everything you want again after moving your asset folder back.
The only huge downside is that if you accidentally re-import all, refresh, or anything involving recursion/automation you have to manually import all of your files again to get rid of the unwanted files.
This is a HORRIBLE workflow and by no means a good solution, just the only working solution that I have come up with.
So please, lets figure this one out, or suggest to the developers to add blacklisting of asset imports as a feature in upcoming versions of Unity.