Locked files cause merges to fail with "Something went wrong during pre-receive hook"
A number of people came across this today while trying to merge to www-gitlab-com. From gitlab-com/www-gitlab-com!19740 (comment 146590159):
UPDATE: Figured out why my commit from command line was also failing. Then a failing MR on a new branch. None of these updates will pass or be permitted because the
data/team.ymlfile is locked by @kirstenabma.
It appears they are doing work on making Bamboo the SSoT.
The error message should be much clearer, e.g.
The merge failed because data/team.yml is locked.
Note that https://gitlab.com/gitlab-com/www-gitlab-com/path_locks is also showing ugly HTML. We probably forgot to call