diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-06 12:18:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-06 12:18:56 +0300 |
| commit | c06178d51ad9b8d4ce665047873615facfc9c1c5 (patch) | |
| tree | 2a1acfea73fd0fbdd7d0e240fd7ac52224845f99 /doc/user/project/file_lock.md | |
| parent | 0a0e8803b0e3e2fb83d74c9bafc32f4e9d825bcc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/file_lock.md')
| -rw-r--r-- | doc/user/project/file_lock.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index b51a1b79a13..576de63d00d 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -15,7 +15,7 @@ Although branching strategies usually work well enough for source code and plain text because different versions can be merged together, they do not work for binary files. -When file locking is setup, lockable files are **read only** by default. +When file locking is setup, lockable files are **read-only** by default. When a file is locked, only the user who locked the file may modify it. This user is said to "hold the lock" or have "taken the lock", since only one user |