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
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?