Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

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

@dnsmichi

Description

@dnsmichi

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.

Metadata

Metadata

Assignees

Labels

featureNew feature or request

Type

No type

Projects

No projects

Milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions