Chapter 3. Finding and Resolving Conflicts
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:
- Finding content inside your Git repository
- Stashing your changes
- Fixing errors by practical examples
Finding content inside your repository
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 ...
Get Git Best Practices Guide now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.
