To Remove the user.name and user.email from global git config;
Open the Git Bash and enter the following code:git config --global --unset-all user.name
git config --global --unset-all user.email
Master Branch — master
Feature C— feature-c (branch which will have the conflict with master)
List down the available branches
git branch -aCheckout the master branch
git checkout masterMerge the feature-c for the master
git merge feature-c<MERGE CONFLICT ERRORS SHOULD LIST IN THE TERMINAL>
Go to the each of files and resolve each conflict manually.
