Creating short-lived branches

Once you have initialized your repository and created your first branch, you can start writing code for your feature.

While this is exciting, this guideline is meant more for teams as opposed to an individual building a side project. The larger the team, the more critical this becomes to your workflow.

Let’s look at an example using multiple feature branches in Figure 1.6.

Figure 1.6: Long-lived feature branch (feature/settings)

Everyone is assigned their respective feature branches, which are created for them. As you can see, the developers are completing their features and checking them into develop.

However, the developer working on the settings feature (feature/settings) is behind. Their branch is becoming stale since they haven’t updated their code over the week. It only contains their feature from when they first created their branch.

What do you think will happen if they decide to commit their...