How to Fix Merge Conflicts in Git

If you’ve ever worked on a team that's working on a large codebase, you’ve likely experienced merge conflicts while creating a pull request or merging two branches. Even if you’ve never worked with a team or on a large codebase, it is still possible to have merge conflicts as long

from freeCodeCamp.org https://ift.tt/cLy7R2m
via IFTTT https://ift.tt/vrGEh0N