Jump to content

Recommended Posts

Hi everyone!

I have been using plastic for 2 weeks without any problem. But, the last time I tried to verify some changes in a project, an error message appeared and the operation was canceled. I have tried all kinds of things, but I have no results.

Any help will be appreciated!

Greetings, Juan.

 

image.png.dcecf7e2b22f5628710743aaa33a459b.png

Share this post


Link to post
Share on other sites

Hi,

This message appears when you are trying to commit some changes but a merge operation is not finished. You can re-run the merge operation from the branch explorer to finish solving the conflicts or you can just undo the changes.

If your pending to commit changes involve merge changes, you need to checkin all of them. You cannot partially only checkin some merge changes.

Regards,

Carlos.

Share this post


Link to post
Share on other sites
23 hours ago, calbzam said:

Hi,

This message appears when you are trying to commit some changes but a merge operation is not finished. You can re-run the merge operation from the branch explorer to finish solving the conflicts or you can just undo the changes.

If your pending to commit changes involve merge changes, you need to checkin all of them. You cannot partially only checkin some merge changes.

Regards,

Carlos.

Hi Carlos,

The problem is, that this error also appears when I try to check all the changes I've made, not only a part of it.

So, I don't know how to solve this, in the Branch Explorer the only option I have is to checkin the pending changes or undo te pending changes.

Regards,

Juan.

Share this post


Link to post
Share on other sites

Hi,

The problem may be that you need to re-run the merge operation from the "branch explorer" view in order top finish solving the merge conflicts and only at this point to you will be able to checkin your changes. If you do not find a workaround, please reach us at support@codicesoftware.com  and we could arrange a GoToMeeting with you.

 

Regards,

Carlos.

Share this post


Link to post
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

Loading...

×
×
  • Create New...