Working with YAMLMerge

If you’d like to configure a different tool for use with YAMLMerge, please see the Unity Manual. YAMLMerge can also be run directly from the command line.

• Open your .gitconfig file. This is typically in your user/home directory.
• At the end, type:

[merge]
   tool = unityyamlmerge
[mergetool "unityyamlmerge"]
   trustExitCode = false
   cmd = 'C:\\Program Files\\Unity\\Hub\\Editor\\2019.2.11f1\\Editor\\Data\\Tools\\UnityYAMLMerge.exe' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED"

• The path to Unity will vary depending on your platform, version number, and whether you’ve installed Unity directly or through the hub.

1. From the Edit drop-down in the Unity Editor, select Project Settings.
2. Click on Editor.
3. Under Version Control, set Mode to Visible Meta Files if it’s not set already (Figure 01).
4. Set Asset Serialization to Force Text if it’s not set already (Figure 01).

When there’s a merge conflict, open Git Bash and type: git mergetool

When invoking YAMLMerge directly from the command line, you can specify which version of a file to keep by using -l or -r. You can also premerge by using the -p switch, and enable headless mode (suppress all error dialogs) by using -h. For more information on these options, invoke unityyamlmerge from the command line with no additional parameters.

This has been a brief introduction to YAMLMerge, a tool that is included with Unity to resolve merge conflicts when using version control with your projects.