![]() If the conflict is a relatively simple one, SmartMerge will be able to determine the correct course of action and merge the data. If you’ve done everything right, the next time you have a merge conflict with Unity scenes or prefabs, you should be able to right click on the file in File Status in SourceTree, go to Resolve Conflicts, and then Launch External Merge Tool. The easiest way that I’ve found to do this in SourceTree is to open the Terminal and enter the following: git config –global mergetool.keepBackup false In his Gamasutra post that summarizes his GDC talk, Tim Pettersen also recommends turning off “keepBackup” for your merge tool, which will help keep your working directory clean. 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”
0 Comments
Leave a Reply. |