How to resolve merge conflicts after git rebase
Have you faced a merge conflict while performing git rebase operation ? This is quite possible if two commits modify the same line in the same file. Now git is confused which change to apply.
merge conflict