Unity Issue Tracker - UnityYAMLMerge duplicates list elements when there are changes on both sides
Closed
UUM-139165
UnityYAMLMerge duplicates list elements when there are changes on both sides
Unity: Version Control
As Designed
6.7.X
6.6.X
6.5.X
6.4.X
6.3.X
6.0.X
Renaming the field from ID to fileID would allow UnityYAMLMerge to correctly identify elements as unique. This ensures proper conflict detection without requiring any changes to the merge tool itself.
Reproduction steps:
Download and extract the “IN-139130” project folder
Open a new Terminal window at the “IN-139130/MergeTests“ folder
Run the following command: (Edit it to fit the exact scenario) /Applications/Unity/Hub/Editor/6000.0.67f1/Unity.app/Contents/Tools/UnityYAMLMerge merge -p baseS.unity theirsS.unity yoursS.unity resultS.unity
Note: In 6000.3 and up, the “Tools” folder has been renamed to “Helpers”
Open the “IN-139130/MergeTests/resultS.unity” file with any text editor app (like Visual Studio Code)
Observe the mTerms property in lines 344-366
Actual results: The “mTerms” property in line 344 has two copies of the same element ID (“-1154547082”) with different values meaning it silently duplicated these elements instead of marking a conflict
Expected result: The “mTerms” has the elements merged or a conflict is marked for the merge