Commit 4a369bda authored by Marcia Ramos's avatar Marcia Ramos

add overview + use-cases to file locking

parent 5cd7c263
...@@ -7,20 +7,25 @@ This feature was [introduced][ee-440] in GitLab EE 8.9. ...@@ -7,20 +7,25 @@ This feature was [introduced][ee-440] in GitLab EE 8.9.
>**Note:** >**Note:**
This feature needs to have a license with the "File Lock" option enabled. If This feature needs to have a license with the "File Lock" option enabled. If
you are using Enterprise Edition but you don't see the "Lock" button, you are using Enterprise Edition Premium but you don't see the "Lock" button,
ask your GitLab administrator. Check GitLab's [pricing page] for more information. ask your GitLab administrator. Check GitLab's [pricing page] for more information.
## Overview
GitLab gives you the ability to lock any file or directory in the repository tree GitLab gives you the ability to lock any file or directory in the repository tree
reserving you the right to make changes to that file or directory. **Locking only reserving you the right to make changes to that file or directory. **Locking only
works for the default branch you have set in the project's settings** (usually works for the default branch you have set in the project's settings** (usually
`master`). `master`).
## Use-cases
The file locking feature is useful in situations when: The file locking feature is useful in situations when:
- Multiple people are working on the same file and you want to avoid merge - Multiple people are working on the same file and you want to avoid merge
conflicts. conflicts.
- Your repository contains binary files in which situation there is no easy - Your repository contains binary files in which situation there is no easy
way to tell the diff between yours and your colleagues' changes. way to tell the diff between yours and your colleagues' changes.
- Prevent design assets from being overwritten
Locked directories are locked recursively, which means that everything that Locked directories are locked recursively, which means that everything that
lies under them is also locked. lies under them is also locked.
......
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