Commit 06aed758 authored by Mike Lewis's avatar Mike Lewis

Merge branch 'docs/brendan-file-locking' into 'master'

Documentation: Add why statement to file locking

See merge request gitlab-org/gitlab!30302
parents 41285b40 74d31882
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/440) in [GitLab Premium](https://about.gitlab.com/pricing/) 8.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. 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.
Lock any file or directory, make your changes, and then unlock it so another
member of the team can edit it. 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 ## Overview
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment