scaslin Posted January 9, 2019 Report Share Posted January 9, 2019 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 Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.