How to Resolve Git Conflict

Introduction You’ve started using git and GitHub and you have started collaborating with your team on several projects. There is the master branch where everyone has forked from and everyone has worked on the different features assigned to them and t...