Jump to content
scaslin

Unity VersionControl API

Recommended Posts

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

 

Share this post


Link to post
Share on other sites
Guest
You are commenting as a guest. If you have an account, please sign in.
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...

×