The Working development and Feature development Branches
Explore the management of Git branches focusing on the working development and feature development branches. Understand the use of the --no-ff merge option to maintain commit history and learn how to handle multiple feature branches for experimentation and integration into the development branch for stable production.
We'll cover the following...
Working development branch
The development branch is the latest compilable code. It’s like a nightly build.
When the development branch is tested stable, we can then fast-forward the production branch into it.
Use git merge with --no-ff
When we merge and fast-forward the stable production branch into a development branch, we may choose to merge with the option --no-ff. The no-ff option stands for “no fast-forward.”
This means that even the stable branch can be fast-forwarded. We still want to create a new commit object. In such a case, when we git log the graph, we can always see that it’s merged with two parent nodes.
This practice allows us to log when and where ...