Jon Posted June 21, 2022 Report Share Posted June 21, 2022 Hi Guys, I am trying to merge two branching and resolve a conflict in a .unity file. I have added the following as a merge tool for .unity files in Plastic's config. "/Applications/Unity/Hub/Editor/2020.3.25f1/Unity.app/Contents/Tools/UnityYAMLMerge" merge -p "@basefile" "@sourcefile" "@destinationfile" "@output" So my hope is that when I try to resolve the conflict, UnityYAMLMerge will do most of the work then hand over to FileMerge so I can manually do the rest. The problem is that when I save the changes in FileMerge then close the program, PlasticSCM does not recognise that the merge has been resolved and still says there are 5/5 conflicts remaining. How can I resolve this please? Link to comment Share on other sites More sharing options...
Jon Posted June 21, 2022 Author Report Share Posted June 21, 2022 In the end I worked around this issue by installing Beyond Compare and hacking my mergespecfile.txt file to load this instead of the crappy Apple compare tool. 1 Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now