Merge from main failed due to exclusive lock

[wzl]

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

 

[psantosl]

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

[wzl]

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