diff options
Diffstat (limited to 'doc/user/project/merge_requests/conflicts.md')
-rw-r--r-- | doc/user/project/merge_requests/conflicts.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/conflicts.md b/doc/user/project/merge_requests/conflicts.md index 44cef4d63e5..fefc6aabddf 100644 --- a/doc/user/project/merge_requests/conflicts.md +++ b/doc/user/project/merge_requests/conflicts.md @@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w type: reference, concepts --- -# Merge conflicts **(FREE)** +# Merge conflicts **(FREE ALL)** _Merge conflicts_ happen when the two branches in a merge request (the source and target) each have different changes, and you must decide which change to accept. In a merge request, Git compares |