Commit 0277bf92 authored by Mike Lewis's avatar Mike Lewis

Merge branch '48442-rebase-grammar-docs' into 'master'

Correct grammar on "Introduction to Git Flow" page in documentation

See merge request gitlab-org/gitlab-ee!6777
parents 10c3bae8 6bcfee64
......@@ -247,7 +247,7 @@ Before accepting a merge request, select `rebase before merge`.
![Merge request widget](merge_request_widget.png)
GitLab will attempt to cleanly rebase before merging branches. If clean rebase is not possible, regular merge will be performed.
If clean rebase is possible and history of the target branch will be altered with the the merge.
If clean rebase is possible, the history of the target branch will be altered with the the merge.
In conclusion, we can say that you should try to prevent merge commits, but not eliminate them.
Your codebase should be clean but your history should represent what actually happened.
......
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