Jump to content
karmakat

Merge To( from ) fails in cm but not in gui

Recommended Posts

Hi,

I am attempting to run a "merge to" operation using cm, which fails with a message like :

The "Merge-to" operation cannot be executed because the merge from changeset cs:80@studio_library to branch br:/aberland has conflicts. It is neccesary to run a "Merge from" operation from a workspace to resolve those conflicts.


If I run a "merge from" inside the gui, the merge processes without any messages or conflicts! 

It is unclear what the difference here is, since this afaik this is the exact same operation.

My cm command ( server name redacted ?

cm merge cs:80@rep:studio_library@ssl://#####:8088 --to=br:/aberland@rep:studio_library@ssl://####:8088 --merge

I read in an another post that someone was experiencing similar issues when they had xlinks in their repo.

 

If indeed, there are conflicts, I would expect to see a message about what these are. As well, since this operation is part of our pipeline tools that wrap around plastic, if there was a way to display the merge conflict resolver gui, that would be excellent. Any help with this front would be much appreciated as well.

Thank you!

- Aleks

 

Share this post


Link to post
Share on other sites

Hi @karmakat,

sorry for the long delay answering, I totally missed this post.

Which Plastic SCM version do you use? Make sure your client.conf has the following entry:

<ServerSideMergeEnabled>yes</ServerSideMergeEnabled>

With the "7.0.16.2679" release (and higher) the Plastic SCM server is able to solve merge-to conflicts even if they are inside an xlink. Give it a try!

Share this post


Link to post
Share on other sites

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 account

Sign in

Already have an account? Sign in here.

Sign In Now

×