In this chapter, we saw how to work within a team using Git, which is very common for most developers. Now, you understand what a branch is, how we can merge them, and how to rebase one branch on another. We also saw how to tag a commit. Now you are ready to prepare and work on your Git repository, but there is something that has been left behind: what should you do if there are conflicts? The next chapter is dedicated to this question. We will see how to find something in your repository, explore the repository, and most importantly, how to fix conflicts and errors.