Skip to content

Instantly share code, notes, and snippets.

@ClintChil

ClintChil/UnityYAMLMerge Cygwin Git for Windwows

Created August 29, 2016 16:41
Show Gist options
  • Save ClintChil/71d149b117d688ef2d540267d30fd9cc to your computer and use it in GitHub Desktop.
Save ClintChil/71d149b117d688ef2d540267d30fd9cc to your computer and use it in GitHub Desktop.
Download ZIP
Raw
UnityYAMLMerge Cygwin Git for Windwows
How to setup UnityYAMLMerge.exe on Git for Windows
add "C:\Program Files\Unity\Editor\Data\Tools\" to your path in Windows
git config --global merge.tool unityyamlmerge
git config --global mergetool.unityyamlmerge.cmd 'unityyamlmerge.exe merge -p "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)"'
git config --global mergetool.unityyamlmerge.trustExitCode false
This makes merging .scene files a breeze.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment