Search Unity

  1. Unity 2018.3 is now released.
    Dismiss Notice
  2. The Unity Pro & Visual Studio Professional Bundle gives you the tools you need to develop faster & collaborate more efficiently. Learn more.
    Dismiss Notice
  3. We've updated our Terms of Service. Please read our blog post from Unity CTO and Co-Founder Joachim Ante here
    Dismiss Notice
  4. Want to provide direct feedback to the Unity team? Join the Unity Advisory Panel.
    Dismiss Notice
  5. Improve your Unity skills with a certified instructor in a private, interactive classroom. Watch the overview now.
    Dismiss Notice

Version Control API with Plastic SCM

Discussion in 'External Tools' started by scaslin_jaw, Jan 10, 2019.

  1. scaslin_jaw

    scaslin_jaw

    Joined:
    Sep 10, 2014
    Posts:
    2
    We have a build machine that light bakes our scenes. I need to submit the light maps to the plastic server.

    I have a basic form of this working OK but when the build machine is out of sync with our plastic server I get an error saying "PlasticSCM : Submit: A merge is needed from changeset 95 to changeset 94 (the changeset you are currently working on) before submitting your changes. You need to solve the conflicts between your current workspace contents and the new contents on your current branch."

    So I need to merge and resolve any conflicts before submitting. How do I do this with the VersionControl API? I've tried Provider.Merge & Provider.Resolve but to no avail.

    Is there any example code for this? or documentation describing the process?

    Help