"Some Merge Operations Cannot Be Applied" when just trying to merge

[Fylyp]

Hi, I have big project where on different branch I was making changes in directories (changing names, moving them) (I had to apply some local changes to be able to checkin)

I was merging from main branch to my without any problems, but today I wanted to merge my branch to main and check if everything is right but I've got this error when tried to start merge:

"Some Merge Operations Cannot Be Applied"

I including screenshot, I don't giving me any other info, just 'can't be applied", I have to update plastic to newest version because now I have client 5.4.16.803 but don't know now chich version on server.

 

Thanks in advance.

[manu]

Hi Fylyp,

I will need you to upgrade to the latest release: https://www.plasticscm.com/download/6.0.16.1264 In order to check if it makes a difference, your release is quite old.

Enable the Plastic SCM log, unfortunately the error message is not explaining what's going on, let's check if the log can give us more details. Check this link to learn how to enable it: https://www.plasticscm.com/documentation/technical-articles/kb-enabling-logging-for-plastic-scm-part-i.html, after enabling the log please repeat the merge operation and send us the log generated.

BTW, it seems all the conflicts are automatic, can you please check what happens if you run a "merge-to" operation? New to merge-to? Check this: http://blog.plasticscm.com/2012/07/merge-to-merging-on-fly.html

[Fylyp]

Hi! Sorry for late reply, but just now we had moment for update server and after update everything went smoothly!  

[calbzam]

Thanks for updating the ticket