Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2fc0849c
Commit
2fc0849c
authored
Jul 09, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add example of MR error msg due to file locking
[ci skip]
parent
893aa713
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
doc/user/project/file_lock.md
doc/user/project/file_lock.md
+7
-1
doc/user/project/img/file_lock_merge_request_error_message.png
...ser/project/img/file_lock_merge_request_error_message.png
+0
-0
No files found.
doc/user/project/file_lock.md
View file @
2fc0849c
...
...
@@ -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,
...
...
doc/user/project/img/file_lock_merge_request_error_message.png
0 → 100644
View file @
2fc0849c
78.8 KB
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment