Ruymán Posted October 5, 2021 Report Share Posted October 5, 2021 Hi there, I'm trying to create a script to automatize tasks in Plastic SCM using CLI commands. I'm struggling to prevent the cm ci command from showing the UI to solve conflicts. I can see there's an --ignorefailed option when using cm partial ci but I can't find any equivalent to do the same when in a non-partial workspace, how do I skip user interaction completely? Thanks in advance Link to comment Share on other sites More sharing options...
calbzam Posted October 7, 2021 Report Share Posted October 7, 2021 Hi, If you want to prevent the command to manually solve conflicts, I guess you are running a merge prior to the checkin? Conflict resolution is liked to a merge opeartion. With the "cm merge --help" command you can check how to automatize the conflict resolution: --keepsource Accepts all changes from source contributor for items with conflicts. --keepdestination Preserves changes from destination contributor for items with conflicts. --automaticresolution Used to resolve directory conflicts. This option lets you choose whether the source or the destination contributor should be automatically selected to resolve the conflict. Use a semicolon to separate conflict types. See Remarks for more info. Regards, Carlos. Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now