Jump to content
Plastic SCM forums are now in Unity. Click here to open the new forum ×

Jon

Members
 View Profile  See their activity

  • Posts

    2

  • Joined

  • Last visited

  • Days Won

    1

Jon last won the day on June 27 2022

Jon had the most liked content!

Jon's Achievements

Newbie

Newbie (1/14)

  • One Month Later Rare
  • Week One Done Rare
  • First Post Rare
  • Conversation Starter Rare

Recent Badges

1

Reputation

  1. Jon
    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.
  2. Jon
    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?
×
×
  • Create New...