From 9f62b405a8ea86a25c6257ce02d6f39eeb7709b9 Mon Sep 17 00:00:00 2001 From: Rouzbeh Sarrafieh Date: Thu, 28 Jul 2016 21:16:35 +0000 Subject: [PATCH] Updated line 20 from ```- Multiple people are working on the same file and you won't to avoid merge``` ```- Multiple people are working on the same file and you want to avoid merge``` Update file_lock.md --- doc/user/project/file_lock.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md index 394b359ac8b274..d8f29ea233cd30 100644 --- a/doc/user/project/file_lock.md +++ b/doc/user/project/file_lock.md @@ -17,7 +17,7 @@ works for the default branch you have set in the project's settings** (usually The file locking feature is useful in situations when: -- Multiple people are working on the same file and you won't to avoid merge +- Multiple people are working on the same file and you want to avoid merge conflicts. - Your repository contains binary files in which situation there is no easy way to tell the diff between yours and your colleagues' changes. -- GitLab