techfortalk.co.uk
How to resolve merge conflict in GIT
Merge Conflict Often you will encounter merge conflicts while doing rebase operation as described above.