"Can't get new changes (Incoming Changes) because you need to checkin the current merge first"

Unity Services
,
1

Today when I tried to commit a merge I got the following error.

Can’t get new changes (Incoming Changes) because you need to checkin the current merge first. You can checkin your changes to a new branch or alternatively merge from the last changeset of the current branch.

I have found a reference to this message from 2020.

My production steps were:

  • Merge from Branch B to Branch C.
  • Resolve.
  • Make some local changes on unrelated files.
  • Try to commit resolved merge (in Branch C).
  • When trying to checkin anything the error message mentioned above appears.

There are no incoming changes, the server has no changes.

I’ve tried a few things without success:

  • I have tried to commit just the merge, not the unrelated local changes, same error.
  • I have tried to commit unrelated local changes, same error.
  • I have deleted the unrelated changes, and I still get the same error.

I have a few questions:

  • How can I diagnose the problem?
  • How can I find the file(s) that are causing this error?
  • How can I revert to a good state without losing my merge?
2

Hi,

This error normally happens because the merge operations is not finished (some merge conflicts are still pending).
Do you have Xlinks?
Are you using a recent Plastic version?

This explanation from the original post should be still valid:


If the answer is yes, he needs to run a new merge from the last changeset in the branch (or the branch itself) to retrieve the latest changes in the branch before checking-in his local changes.

The Incoming Changes is not able to run if there is a pending merge to checkin in the workspace.

You can check the pending merge links in the Pending Changes view: https://www.plasticscm.com/documentation/gui/plastic-scm-version-control-gui-guide#MergeinthePendingchangesView

If the answer is no, I guess he run an Incoming Changes operation that threw some error.

The problem is that the Incoming Changes operation failed in the middle (because internally it runs a merge in a first stage).

Could you send the client log files to support@codicesoftware.com. You can fin the log files (plastic.debug.log.txt) located in the plastic user folder

C:\Users\xxxx\AppData\Local\plastic4\logs\plastic.relevant.log.txt
To continue using the workspace, he can try two different options:

- manually backup the local workspace changes, undo all the workspace changes, reapply them manually in the workspace and retry the operation.
- shelve (and undo) the workspace changes, update your workspace to the last changeset in the branch, apply the shelve in the workspace and checkin your changes.

If the issue, persists, please reach us at support@codicesoftware.com. We can even connect with you to debug the problem.