📝 한국어 문서

Tools

This document is based on Windows.

• SourceTree (Git GUI)
  • Other GUIs are also available, but the setup varies. (Official Documentation)
• UnityYAMLMerge
  • Used to resolve conflicts such as scenes, prefabs, etc. that SourceTree cannot handle automatically
  • Built-in from Unity
• Meld (Merge tool)
  • Used to resolve conflicts that UnityYAMLMerge cannot handle
  • OS X not supported

Tool Settings

Meld installation and fallback setup

Meld installation

• Download from here: https://meldmerge.org/
• Set the path to: C:\\Program Files\\Meld

Modify UnityYAMLMerge fallback file - mergespecfile.txt

• Fallback file path: C:\\Program Files\\Unity\\Editor\\Data\\Tools\\mergespecfile.txt

Open the file in the path above and modify it as below. Content changes may require administrator privileges.

15 to 21 lines should be changed like the capture. When there is a part that UnityYAMLMerge cannot handle, an external tool can be executed to handle the conflict directly. We use Meld for external tool.

To modify the file as shown in the above capture, modify the lines 15 to 21 below.

before

unity use "%programs%\\YouFallbackMergeToolForScenesHere.exe" "%l" "%r" "%b" "%d"
prefab use "%programs%\\YouFallbackMergeToolForPrefabsHere.exe" "%l" "%r" "%b" "%d"

#
# Default fallbacks for unknown files. First tool found is used.
#

after