In the previous article, we started coding on a new branch to add new features to our project. However, to make those features available in our master branch, we must perform further steps to integrate changes from the feature branch to the master. There are two common ways to do this: merging and rebasing. This article will explore how merging works step-by-step to provide you with the entire basic flow of working with Git. Let’s get started!