Unity Yaml Merge Tool

✍ Last Updated : January 7, 2023

🚪 Prequisite Knowledge (Optional)

UploadDescribe InInitial ProgressKnowledge that reader need to know before reading this article

1. [Unity 3D](Unity 3D 5532e59028e74dd5938b01064478ba74.md)
2. Git

❓ Key Question / Problem / Issue

Describe what question / Problem / Issue this knowledge should answer

1. what is unity yaml merge
2. how to implement unity yaml merge
3. can / should we standardize it’s implementation

✅ Expected Output/Definition of Done

Define what information you really need and the definition of done

Information on Unity Yaml Merge

1. solution it Offers
2. implementation demo
3. it’s verdict (pros and cons) whether you should use it or not

🎁 Resulting Solution

Write writing results below

What is Unity Yaml Merge

Unity Yaml Merge is CLI Tool that automatically resolve merge conflict of unity generated yaml file.

Smart merge

Using Unity Yaml Merge

Setting up Unity Yaml Merge as Git Merge Tool

Configuring Merge Rule

you can configure how unity yaml merge will go through merge rule that shown in unity docs above

Feedbacks & Verdict

Cons

1. it doesn’t show what it does.
2. user don’t know what actually changed
3. merged output are random / not really known without proper understanding of Merge Rule
4. merge rule really hard to understand

Pros

1. Automatically resolve merge conflict as it promises
2. able to restore broken yaml caused by committed merge conflict

Verdict

Other Solutions

here are different solution that might be able to solve similar issue

📦 GitMerge for Unity - de.thirteenpixels.gitmerge