Search Unity

  1. Good news ✨ We have more Unite Now videos available for you to watch on-demand! Come check them out and ask our experts any questions!
    Dismiss Notice
  2. Ever participated in one our Game Jams? Want pointers on your project? Our Evangelists will be available on Friday to give feedback. Come share your games with us!
    Dismiss Notice

SmartMerge Nuking Prefab

Discussion in 'External Tools' started by ramen_kilogold, Jun 19, 2020.

  1. ramen_kilogold

    ramen_kilogold

    Joined:
    Jun 19, 2020
    Posts:
    3
    I'm using PlasticSCM5, which is accessible from my path, and thus usable as a fallback. It shouldn't matter which fallback I'm using so long as it's configured properly in the mergespecfile.txt.
    When I run the SmartMerge directly from a command line tool, I get no errors.

    The resulting merge content is simply:
    Code (JavaScript):
    1. %YAML 1.1
    2. %TAG !u! tag:unity3d.com,2011:
    3.  
    The command used is:
    Code (JavaScript):
    1. .\UnityYAMLMerge.exe merge -p -i .\mergeresolving.txt -o "C:\Merge\wat"
    2. --rules .\mergerules.txt
    3. --fallback .\mergespecfile.txt
    4. "C:\Merge\PlayerCharacter.prefab#2140.prefab"
    5. "C:\Merge\PlayerCharacter.prefab#2156.prefab"
    6. "C:\Merge\PlayerCharacter.prefab#2166.prefab"
    7. "C:\Merge\Merged.prefab"
    The numbers are in chronological order, so #2040 is the ancestor, where the others are the candidates to merge.

    I've added extra flags and tried to make it as verbose as possible, but no results. The output file is just as blank:
    Code (JavaScript):
    1. Conflicts:
    2. Conflict handling:
    3.  
    I'm not sure what to do at this point. Getting any merge tool will do the job, of course - but it will corrupt the file because it needs that YAML context that SmartMerge is supposed to figure out.

    What am I missing here? I'm providing the files I'm using. Can someone show me how it's done?
    I'm using Unity 2019.3.4f1.
     

    Attached Files:

    laurenfraz likes this.
  2. CircuitLord

    CircuitLord

    Joined:
    Dec 15, 2016
    Posts:
    7
    +1 same issue
     
    ramen_kilogold likes this.
  3. malrion

    malrion

    Joined:
    Dec 23, 2016
    Posts:
    9
    +1 same issue
     
  4. laurenfraz

    laurenfraz

    Joined:
    Jun 8, 2017
    Posts:
    1
    +1, me too :(
     
  5. ramen_kilogold

    ramen_kilogold

    Joined:
    Jun 19, 2020
    Posts:
    3
unityunity