search

SmashedRockSoftware / Project_MissCrow

Pirate Game Jam, 2024
0 stars 0 forks source link

Investigate magic way to merge gits #45

Closed IllogicalDesigns closed 1 month ago

IllogicalDesigns commented 1 month ago

Such alchemy is only spoken about in the darkest of shadows of the unity forums, goood thing they shut those down.

IllogicalDesigns commented 1 month ago

Unityyamlmerge is a tool that can somehow magically merge the yaml that makes up scenes and prefabs. Just have to setup some git commands, point it at this tool, you already have, then run it when a conflict arrises. Any non conflicting changes will just be merged.

For instance if I change car 1, and emma changes car 2. then we merge them together, its fine. should be manageable if we change the same value on the same gameobejct through standard merge methods. Meld was suggested.