Search Unity

  1. Unity 6 Preview is now available. To find out what's new, have a look at our Unity 6 Preview blog post.
    Dismiss Notice
  2. Unity is excited to announce that we will be collaborating with TheXPlace for a summer game jam from June 13 - June 19. Learn more.
    Dismiss Notice

Git SmartMerge issue (unityyamlmerge.exe)

Discussion in 'Formats & External Tools' started by RobRab2000, May 11, 2021.

  1. RobRab2000

    RobRab2000

    Joined:
    Nov 28, 2012
    Posts:
    29
    Hi, I'm trying to verify whether I have gotten the SmartMerge tool working correctly? I've followed the instructions in the documentation (correcting for the appropriate executable path).

    I've created a simple merge conflict where a scene object has been moved in 2 separate branches which I am now merging.. when I run the mergetool I get the following response followed by P4Merge being opened to resolve the merge.. is this correct?
    upload_2021-5-11_17-3-16.png