diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-28 09:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-28 09:08:59 +0300 |
| commit | fd01ef494eca13de9767e697280c6387f0fbb328 (patch) | |
| tree | 72fb28f4c2ef2a61205e986838cf89fa7cdc2187 /doc/user/project/file_lock.md | |
| parent | deb09d4cc12ea6302ef0b7534e1a1b5789732472 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 49918b8f023..22345824e35 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w type: reference, howto --- -# File Locking **(CORE)** +# File Locking **(FREE)** Preventing wasted work caused by unresolvable merge conflicts requires a different way of working. This means explicitly requesting write permissions, @@ -26,7 +26,7 @@ GitLab supports two different modes of file locking: - [Exclusive file locks](#exclusive-file-locks) for binary files: done **through the command line** with Git LFS and `.gitattributes`, it prevents locked - files from being modified on any branch. **(CORE)** + files from being modified on any branch. **(FREE)** - [Default branch locks](#default-branch-file-and-directory-locks): done **through the GitLab UI**, it prevents locked files and directories being modified on the default branch. **(PREMIUM)** |