Commit e0df3690 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch 'msj-file-lock-typo-docs' into 'master'

Fix typo in file_lock.md

See merge request gitlab-org/gitlab!30366
parents 1d245e55 c60ddf7d
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
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. 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. With File Locking, 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