diff --git a/docs/git-guide.md b/docs/git-guide.md index d72c291478..f66ea51afe 100644 --- a/docs/git-guide.md +++ b/docs/git-guide.md @@ -1462,7 +1462,7 @@ Deleting local branch review-original-5156 (was 5a1e982) ### Merge conflict on yarn.lock file -If there is a merge conflict on yarn.lock, yarn.lock, yarn should be run to +If there is a merge conflict on yarn.lock, yarn should be run to regenerate the file. *Important* don't delete the yarn.lock file. Checkout the latest one from origin/master so that yarn knows the previous asset versions.