How to resolve a Git conflict
Let’s say a friend of made a change to your repository and pushed the changes to the Git remote. At the same time, you also made a change to the same line of code.
When you pull their changes onto your local repository, you’ll notice that there is a conflict.
This happens because Git no idea whether their version is the updated version or your version is the updated version.
This is what we call a Git conflict.
You’ll learn how to resolve a Git conflict today.
Here’s the video, podcast and text versions:
- Text / Podcast version: https://zellwk.com/blog/resolving-git-conflicts
- Video version: https://youtu.be/qLFj3H0j998
Enjoy!
Stay awesome,
Zell