Merge without checkin from command line

[David Cañadas]

Hi,

ATM I'm writing some automation code that uses Plastic. I need to run a merge from the command line without checking it in (as can be done in the Plastic SCM GUI when you perform a merge). Is there any command line to do so? I was unable to find it out.

For the sake of clearness, I need to keep file history so shelving is not an option.

Thank you!

[Rafael]

Hi David,

This command will give you a list telling you what's the action of each file. By default it won't be checked in and the changes wont be applied neither appear in the pending changes view.

cm merge name-of-branch

This command will perform the merge. By default it won't be checked in. The changes will be applied and will appear in the pending changes view.

cm merge name-of-branch --merge

Then if you want to check-in use:

cm ci

Source: Plastic SCM version control · CLI guide

Let me know if this is what you are looking for.

Regards,

Rafael.

Unity/PlastisSCM Support Team.

[David Cañadas]

Hi,

thank you for the answer. However, I think the option I was looking for is

cm merge <BRANCHNAME> --merge --shelve