FlaShG / GitMerge-for-Unity

Unity plugin for merging sceneand prefabs files when using git.
GNU General Public License v2.0
201 stars 27 forks source link

Add support for nested prefabs and prefab variants #66

Open FlaShG opened 2 years ago

FlaShG commented 2 years ago

Investigate what needs to be done to properly support those new concepts, then implement that.

Dak0r commented 1 year ago

Hi, thank you for your work on this project! Is there a list of known issues with prefabs that make use of nesting / variants?

Edit: I did some quick testing: Some Info on nested/variants: Those work in the way, that the variants and prefabs with nested prefabs yml files only contain a reference to the original (or nested) prefab and a list of attributes that are overriden by it. So the concept is quite basic.

I didn't test it extensively, yet, but it seems to work good enough for basic conflicts 🙂

During my test I found a different issue related to RectTransforms: https://github.com/FlaShG/GitMerge-for-Unity/issues/67