Prefab modifications stored in assets, causing merge conflicts and large files

Unity Engine
1

Hi,

since some versions ago (5.1.1ish), Unity editor started to record modifications within prefab assets in the asset’s yaml file. That was usually only done for scene files.

This causes our gameobject assets to grow quite big over time. Worse, it basically ALWAYS causes a merge conflict. The Issue I reported is #711720 and it hasn’t been answered yet.

Could anyone of the devs have a glimpse at this behaviour? It seems in Unity 5.2.0f3, you did some work to make merges more stable but until this is fixed, all this work is basically useless :frowning:

(ok… its also mostly useless until the UnityUI stops storing all their auto-calculated properties)

2

bump.

Bug is still in 5.2.1p1, still no reply to issue 711720

3

Hi,

Seems like QA did not reply to it, but instead it was assigned directly to me.

It has been reproduced and will be fixed. Can’t say which release it will be in, but I will try to get it to a 5.2 patch

4

This is still not fixed in 5.4.0b1

Any information when it will make it into a public release?

5

Sorry about that it slipped out of my bug list and was forgotten

6

Sustained Engineering team has just confirmed the fix has been back ported to 5.3.2p3