Project Merge Method documentation needed
Summary
Provide more complete descriptions for each merge method that GitLab supports, including a graphical representation of each.
Detail
There are these merge methods available for selection in a GitLab project, as follows:
- Merge commit (git merge --no-ff)
- Merge commit with semi-linear history (git merge --ff-only && git merge --no-ff)
- Fast-forward merge (git merge --ff-only)
These are chosen from in the "Edit Project" screen at URLs like this: https://gitlab.com/group_name/project_name/edit
Customers have asked for better descriptions of what each of these does, including a graphical representation. They want to be able to visualize these. They want to be able to make an informed choice on which to select. In particular, "Merge commit with semi-linear history" is specific to GitLab. In general, customers want advice on what best practice is so they can make informed decisions on this important setting.