wzl Posted July 11, 2018 Report Share Posted July 11, 2018 Good day, I'm working on a feature branch and wanted to merge from main to get it up to date. When processing the merge i receive Quote Error: These items are exclusively checked out by: path/file (user) cancelling the merge. We tried this on two machines and the result is the same. Is an exclusive lock preventing merging entirely? The file in question does not exist on my branch at this point, but it seems to be created from the attempted merge regardless. However, after undoing the pending changes from the merge the file in question still exists, and failed to be removed by the undo-changes. How can this be resolved? Thanks. wzl Link to comment Share on other sites More sharing options...
psantosl Posted July 11, 2018 Report Share Posted July 11, 2018 Hi, We recently released a few changes on the locking strategy, and yours sounds quite related. Can you double check you are on the latest release? (or very close to) Thanks, pablo Link to comment Share on other sites More sharing options...
wzl Posted July 12, 2018 Author Report Share Posted July 12, 2018 Thanks Pablo, I also had a call with one of your colleagues, but generally updating the client helped to work around this. There were some follow-up problems, but those could be solved as well. I'll submit a full reproduction log as a ticket so you can look into it. wzl Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.