Step-by-Step guide to Resolving Merge Conflicts in GIT

When working on a coding project, there might be times where team members, end up making changes to the same file with different contents. This may result in creating conflicting changes on the two feature branches, and then attempting a merge, will ...