See attached screenshot of Git diff. What you see is PrefabInstance with modifications, but their order has changed (yes, it's same prefab instance spanning over 2000 lines) It happens a lot that for some reason Unity decides to reorder prefab modifications. This has no implications for Unity itself, but it creates "fake" changes when there are none in fact. What's more annoying is that when multiple people do some minor changes to prefabs (e.g. changing single value), it can very easily create merge conflicts. Oh and it has some Unity implications, it triggers reimport of prefabs which depends on it, which in our case can take few minutes! Would it be hard to sort modifications by "target" (file id or rather guid) then by "propertyPath"? This seems like obvious solution, while I might be missing something. Should I file this as a bug?