I’ve got a merge request that’s good to go, no conflicts. Using the merge button on gitlab.com will switch over to the loading button for a minute and then go back to the regular merge request dialog.
I merged the feature branch into master locally and have tried pushing/force to master with the following error.
Total 0 (delta 0), reused 0 (delta 0)
remote: error: cannot lock ref 'refs/heads/master': Unable to create '/var/opt/gitlab/git-data-file07/repositories/ncrmro/jtx.git/./refs/heads/master.lock': File exists.
remote:
remote: Another git process seems to be running in this repository, e.g.
remote: an editor opened by 'git commit'. Please make sure all processes
remote: are terminated then try again. If it still fails, a git process
remote: may have crashed in this repository earlier:
remote: remove the file manually to continue.
error: failed to push some refs to 'git@gitlab.com:ncrmro/jtx.git'
Of note is I can pushed the merged master branch, but when attempting to merge the merged master into the master on Gitlab.com I get the following
Something went wrong during merge: Conflicts detected during merge. This merge request failed to be merged automatically
Which I assume is a reference to the lock file.