This chapter covers a part of Git that you will definitely meet: conflicts. How can we resolve them?
While working together as a team on a project, you will work on the same files. The
pull command won't work because there are conflicts, and you might have tried some Git commands and things got bad. In this chapter, we will find solutions to these conflicts and see how we can fix them. We will cover the following topics:
Sometimes, you will need to find something inside all your files. You can, of course, find it with the search feature of your OS, but Git already knows ...