Usually when you run a merge, it results in a fast forward. But sometimes things aren’t so simple.
Here’s a typical scenario where you have to resolve a merge conflict.
First, you perform:
git fetch origin
and then, you perform:
git merge origin/develop
and it results in a merge conflict. Automatic merge failed; fix conflicts and then commit the result.
To Resolve the Conflict
git mergetool