koobas.hobune.stream
Which files are mergeable with Unity Smart Merge?
I was searching about Unity Smart Merge (with git), and lots of people used different setting with this.
Some say Unity Smart Merge can merge *.meta, *.unity, *.asset, *.prefab,
others say Unity Smart Merge can merge *.unity, *.asset, *.prefab,
the others say Unity Smart Merge can merge only *.unity, *.prefab,
and there was even someone suggesting Unity Smart Merge can merge nearly everything, *.mat, *.anim, *.unity, *.prefab, *.physicsMaterial2D, *.physicsMaterial, *.asset, *.meta, and *.controller.
So who is right? Which files are mergeable with Unity Smart Merge?
I would also like to know this. Right now I actually can't get Unity Smart $$anonymous$$erge to work for anything, especially .meta files which blow up with the following error upon an attempt to merge with UnitySmart$$anonymous$$erge (Force Text has been set since the start of the project):
Error parsing file '.merge_file_a11288': File is not a valid text serialized YA$$anonymous$$L file. $$anonymous$$ake sure that Asset Serialization is set to 'Force text' in Editor Settings.
