Created
December 30, 2015 03:17
-
-
Save jareguo/fcc2e47cac06cc3554b4 to your computer and use it in GitHub Desktop.
Use UnityYAMLMerge in SourceTree
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/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