Advance Git & GitHub for DevOps.
A Deep Dive into Advanced Git for DevOps Engineers.
Table of contents
What is Git Branching?
Branching is a feature available in most modern version control systems. Git branches are effectively a pointer to a snapshot of your changes. When you want to add a new feature or fix a bug no matter how big or how small you spawn a new branch to encapsulate your changes. This makes it harder for unstable code to get merged into the main code base, and it gives you the chance to clean up your future history before merging it into the main branch.
What Is Git Rebase?
Rebase is one of two Git utilities that specializes in integrating changes from one branch onto another. Rebasing is the process of moving or combining a sequence of commits to a new base commit. Rebasing is most useful and easily visualized in the context of a feature branching workflow.
What Is Git Merge?
Merging is Git's way of putting a forked history back together again. Git merge will combine multiple sequences of commits into one unified history. In the most frequent use cases, git merge is used to combine two branches. The merge wording can be confusing because we have two methods of merging branches and one of those ways is called “merge,” even though both procedures do essentially the same thing.