Note that these lines should be the same on OSX but I’ve only tested on Windows. If you’re using something other than P4Merge, you will need to determine the correct path and order of the command line arguments. Prefab use “%programs%\Perforce\p4merge” “%b” “%r” “%l” “%d” If you used P4Merge and installed to the default location, change them to this exactly:.Within this file, locate the two lines starting with “unity use” and “prefab use”.Find the following file: /Editor/Data/Tools/mergespecfile.txt.Note that you don’t actually need to register to download, and that when installing you can deselect everything except P4Merge. You should probably use a visual merge tool such as P4Merge from Perforce. SmartMerge needs a merge tool to fall back on. ![]() In the Arguments field, type: merge -p $BASE $REMOTE $LOCAL $MERGED.(On Windows,this will generally be C:/Program Files/Unity/Editor/Data/Tools/UnityYAMLMerge.exe) In the Merge Command field, type the full path to the UnityYAMLMerge executable. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |