Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4a369bda
Commit
4a369bda
authored
Jun 23, 2017
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add overview + use-cases to file locking
parent
5cd7c263
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
doc/user/project/file_lock.md
doc/user/project/file_lock.md
+6
-1
No files found.
doc/user/project/file_lock.md
View file @
4a369bda
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment