This is a sample commands in which resolve the git branch conflict manually through command line.

MergeGitConflict.txt

git checkout -b feature/whitelisting-merge origin/feature/whitelisting
git merge develop
git status
// fix conflicts 
git add .
git commit -m 'resolve conflict'
git status
git checkout feature/whitelisting
git merge --no-ff feature/whitelisting-merge
git push