gitlab-training icon indicating copy to clipboard operation
gitlab-training copied to clipboard

"Merge Feature Branches" LAB should explain the --no-ff with a drawing

Open dnsmichi opened this issue 5 years ago • 1 comments

Encourage the trainer to draw picture with the commit stack, and explain what a "fast foward merge" actually is.

Put the focus on that merge happening without any further reference. Explain the trick to tell Git to treat everything as non-fast-forward with --no-ff. Maybe create an explanatory slide before doing the exercise.

Also reference that this idea will later be seen with GitLab Merge Requests.

dnsmichi avatar Feb 19 '20 17:02 dnsmichi

https://www.programmersought.com/article/74045324711/

Maybe have reference image like these here in the training?

Another idea would be to reconstruct those cases and have screenshots from the gitlab graph view.

theFeu avatar Apr 13 '21 11:04 theFeu

I wanna go even further an properly introduce and explain git merge. In day1 we already have git branch and git pull, two things that are easier to explain when the git merge concept is known.

Then in day2 with have a single lab with git merge and then no explanation on the slides.

I think git merge deserve a bit more attention.

martialblog avatar Jan 11 '23 11:01 martialblog

I think it would fit really well with the explanation of git branch. How does it split off, and how does it get back together are concepts that go well together.

git-netways avatar Jan 11 '23 13:01 git-netways

My suggestions:

  • Introduce the concept of merging after Lab 6.3 and have a another small lab with a local merge
  • Add a slide about Merge Conflicts after Lab 10.2

EDIT: or have a proper lab during the git branch section, before Lab 6.3

martialblog avatar Jan 11 '23 13:01 martialblog

We added more explanation regarding merge conflicts in the training. If required we can add further drawings.

martialblog avatar Jan 12 '23 14:01 martialblog