Follow-up, new merge methods page
The following discussions from !86309 (merged) should be addressed:
-
@trakos started a discussion: I've moved all "fast-forward" documentation to the new merge method page as a separate section. Some of the content also applies to semi-linear merge method, so I think it makes sense to have it on one page.
If this MR would get merged, I would remove this page from menu in
gitlab-docsand add the new entry for merge methods page instead. We could later remove it altogether - though maybe it makes sense to keep it in case it is linked to externally?🤔 -
@tlinz started a discussion: Should we give the readers additional peace of mind, by adding something like this:
"Which merge method you choose almost never influences how the repo looks after a merge. So you should choose the merge method based on how you would want your history to look like: you may want to lean more to merge commit without squash if you want it to be more explicit about each detailed change or lean more towards fast-forward merge if you care about a simpler and cleaner history. The other options are somewhere in-between those two ends of the scale."
-
@tlinz started a discussion: Especially, in this case, I am wondering if we shouldn't have two images that show the before and after the merge.
-
@tlinz started a discussion: Can we say what the benefits are of this merge method?
-
@tlinz started a discussion: Do I understand well, that a ff merge is not performed but we just test if it would be possible? Could we state that more explicitly?
-
@mnichols1 started a discussion: The term squash merges could be confusing here if we introduce squash as a merge method. Maybe
When squashing commits?