The super-easy way to resolve git merge conflicts

What is merge conflict? While building large projects, multiple developers are involved. Therefore there are situations when two developers working on two different branches trying to change the same line of code. Git’s internal mechanism fails to solve this conflict. Finally, it leads to a merge conflict. In this blog, we shall discuss how we can resolve git merge conflicts

Continue reading