Git - Easiest way to resolve a conflict from the command line
Git is a powerful tool and it is amazing how well it works when members of a team are able to submit changes to the same file usually without any issue.
But if you are working with a team to deliver software, chances are you have run into the situation where your pull-request has a red checkmark because your changes cannot cleanly merge into the release branch.
Resolving Conflicts has been a tough point for many developers, new and experienced, over the years.
Today I will go over one of the easiest tricks in the books for ensuring your feature branch is clean against the release branch so that you do not have to worry about pulling in other's changes or introducing peer's dependent features to your branches.
This works great if you are working on new functionality and have not changed logic that others have edited.
