Can't Checkin or Undo changes after merge

[pali]

I merged from main branch to task branch, did multiple changes and then tried to merge back to main branch. 

However if I try to Checkin, I get following error: "Cannot perform the checkin operation. All merge changes must be checked in together to ensure that the merge traceability is correctly stored. Please repeat the operation including all merge changes."

If I try to Undo changes, I get following error: "Cannot perform the undo operation. All merge changes must be undone together. Please repeat the operation including all or none of its changes."

Currently, I am unable to checkin, undo or even switch branch. All files affected by the merge process are selected to be merged. No files have pending changes. What have I done incorrectly or what should I do to be able to checkin the merge, or revert and do things correctly?

Thanks

 

 

[pali]

I solved my problem by deleting all files in ".plastic" folder except "plastic.selector" and "plastic.workspace", then tried to do merge again and everything went as expected and without any issue.

[calbzam]

Hi,

My guess is some items may be filtered in your "Pending changes" view so when you were trying to checkin/undo changes you were getting this error.

If something similar happens again, you can try via console:

cm checkin --all

cm unco --all

Regards,

Carlos.