O'Reilly logo

Git Best Practices Guide by Eric Pidoux

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

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 ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required