Recursive merge
You're working on a feature branch etl-update
, but the main
branch has progressed. You want to ensure a merge commit is created even if a fast-forward is possible. We want to ensure that the commit history of the etl-update
branch is preserved and reflected in the main
branch history.
This exercise is part of the course
Advanced Git
Exercise instructions
- Write the Git command to perform a recursive merge of the
etl-update
branch into themain
branch, forcing a merge commit. - When the editor opens, leave the message as is and exit. You can exit by pressing the keys
CTRL
andX
at the same time.
Hands-on interactive exercise
Turn theory into action with one of our interactive exercises
