Merge branch 'doc-file-lock-ui-msg' into 'master'

Add example of MR error msg due to file locking

[ci skip]

See merge request !544

doc/user/project/file_lock.md

@@ -45,12 +45,18 @@ Delta compression using up to 4 threads.
 Compressing objects: 100% (3/3), done.
 Writing objects: 100% (3/3), 320 bytes | 0 bytes/s, done.
 Total 3 (delta 1), reused 0 (delta 0)
-remote: GitLab: The path '.gitignore' is locked by TheDude
+remote: GitLab: The path '.gitignore' is locked by Administrator
 To https://example.com/gitlab-org/gitlab-ce.git
  ! [remote rejected] master -> master (pre-receive hook declined)
  error: failed to push some refs to 'https://example.com/gitlab-org/gitlab-ce.git'
 ```
 
+Similarly, when a user that is not the author of the locked state of a file
+accepts a merge request, an error message will appear stating that the file
+is locked.
+
+![Merge request error message](img/file_lock_merge_request_error_message.png)
+
 ## Locking a file or a directory
 
 To lock a file, navigate to the repository tree under the **Repository > Files** tab,