Occasionally we've seen users run into issues when they are trying to sync workspaces that have had merge conflicts. We've notified engineering about the issue and they are investigating, but we do have a workaround available. If you seeing merge conflicts and your sync does not complete even after trying 'overwrite with mine' nor 'save both', please see the instructions below.
To start please open a terminal in your workspace.
If you're working within a classic project you'll want to navigate to the /mnt/.domino directory.
For git based projects you'll want to navigate to the /mnt/artifacts/.domino directory.
Within this directory (.domino) please verify you have a processingLock file by typing ls -a in your terminal.
Once you've verified that file exists, you can remove it with this command: rm processingLock
After your terminal returns, please retry your sync from the Domino UI.
If the sync appears to work, we suggest verifying by checking your Domino project files in the Domino UI. Afterwards, you can close the workspace.
If you are unable to locate the processingLock file or are still having issues syncing after trying the above steps, please contact support so we can assist.