Henrique Leitehenriqueleite42.comยทJun 13, 2024Git: How to fix PR conflictsWhen working with PRs, we may encounter conflicts trying to merge them. In this article, we will learn what conflicts are and how to fix them. What causes conflicts In the image above, you can see that we have a main branch called master, and from t...41 readsGitGitHubAdd a thoughtful commentNo comments yetBe the first to start the conversation.