Master Branch — master
Feature C— feature-c (branch which will have the conflict with master)

List down the available branches

git branch -a

Checkout the master branch

git checkout master

Merge 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.

--

--