diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 00:09:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-24 00:09:31 +0300 |
| commit | 427a082f7db22d4432f491aa7ee3a18a62a20d29 (patch) | |
| tree | 6527fb894f736e6b7bb2c93f6ddedee4a4795b53 /doc/user/project/file_lock.md | |
| parent | fdd0b0fd4592c74257980d07878db75705d22192 (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index d5f35051e9a..b5350515c30 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -2,9 +2,9 @@ > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/440) in [GitLab Premium](https://about.gitlab.com/pricing/) 8.9. -File Locking helps you avoid merge conflicts and better manage your binary files. -Lock any file or directory, make your changes, and then unlock it so another -member of the team can edit it. +Working with multiple people on the same file can be a risk. Conflicts when merging a non-text file are hard to overcome and will require a lot of manual work to resolve. File Locking helps you avoid these merge conflicts and better manage your binary files. + +With File Locaking, you can lock any file or directory, make your changes, and then unlock it so another member of the team can edit it. ## Overview |