Skip to content

Instantly share code, notes, and snippets.

@jareguo

jareguo/Use UnityYAMLMerge in SourceTree.txt

Created December 30, 2015 03:17
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jareguo/fcc2e47cac06cc3554b4 to your computer and use it in GitHub Desktop.
Save jareguo/fcc2e47cac06cc3554b4 to your computer and use it in GitHub Desktop.
Download ZIP
Use UnityYAMLMerge in SourceTree
Raw
Use UnityYAMLMerge in SourceTree.txt
/Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge merge -p $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment