![]() *.physicMaterial -text merge=unityyamlmerge diff *.physicsMaterial2D -text merge=unityyamlmerge diff gitattributes file, the following is present: # For line ending normalization between Unix and Windows gitconfig file: Ĭmd = '' merge -p "$BASE" "$REMOTE" "$LOCAL" "$MERGED" On Mac OSX: /Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge On Windows: C:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exeĬ:\Program Files (x86)\Unity\Editor\Data\Tools\UnityYAMLMerge.exe You can read more about it at the following links.Īssuming Unity is installed in the standard location, the path to UnityYAMLMerge will be. It is a pretty decent tool to use for resolving merge conflicts that would be really hard to merge maually (e.g. Unity's Smart Merge (also called UnityYAMLMerge) is a tool shipped with the Unity editor. Configuring Git to use Unity Smart Merge for merging
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |