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
157b4e0d
Commit
157b4e0d
authored
Jun 03, 2019
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes note, inline links
parent
6cb750a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
doc/user/project/file_lock.md
doc/user/project/file_lock.md
+4
-10
No files found.
doc/user/project/file_lock.md
View file @
157b4e0d
# File Locking **[PREMIUM]**
# File Locking **[PREMIUM]**
> **Notes:**
> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440) in [GitLab Premium](https://about.gitlab.com/pricing/) 8.9.
> - [Introduced][ee-440] in [GitLab Premium][ee] 8.9.
> - This feature needs to have a license with the "File Lock" option enabled.
> - This feature needs to have a license with the "File Lock" option enabled. If
> - If you are using Premium but you don't see the "Lock" button, ask your GitLab administrator.
> you are using Premium but you don't see the "Lock" button,
> ask your GitLab administrator.
File Locking helps you avoid merge conflicts and better manage your binary files.
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
Lock any file or directory, make your changes, and then unlock it so another
...
@@ -37,7 +35,7 @@ lies under them is also locked.
...
@@ -37,7 +35,7 @@ lies under them is also locked.
The user that locks a file or directory
**is the only one**
that can edit and
The user that locks a file or directory
**is the only one**
that can edit and
push their changes back to the repository where the locked objects are located.
push their changes back to the repository where the locked objects are located.
Locks can be created by any person who has [push access] to the repository; i.e.,
Locks can be created by any person who has
[
push access
]
(
../../user/permissions.md
)
to the repository; i.e.,
Developer and higher level, and can be removed solely by their author and any
Developer and higher level, and can be removed solely by their author and any
user with Maintainer permissions and above.
user with Maintainer permissions and above.
...
@@ -101,7 +99,3 @@ To view or manage every existing lock, navigate to the
...
@@ -101,7 +99,3 @@ To view or manage every existing lock, navigate to the
locks and
[
remove the ones you have permission for
](
#permissions-on-file-locking
)
.
locks and
[
remove the ones you have permission for
](
#permissions-on-file-locking
)
.
![
Locked Files
](
img/file_lock_list.png
)
![
Locked Files
](
img/file_lock_list.png
)
[
ee-440
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/440
"File Lock"
[
ee
]:
https://about.gitlab.com/pricing/
[
push access
]:
../../user/permissions.md
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