git - Diverged branches, merge does not resolve the issue -

git - Diverged branches, merge does not resolve the issue -

i got message when run git status:

your branch , 'origin/develop' have diverged, , have 1 , 2 different commits each, respectively.

i followed usual steps resolve issue:

git pull resolve conflicts git commit git push

but got force rejected. running git status again:

your branch , 'origin/develop' have diverged, , have 2 , 2 different commits each, respectively.

if seek pull, conflict same before! can commit again, , story repeats on , over. seems git not able determine have done merge. how possible?

please note:

i tried git remote update followed git merge i don't know how situation created, , i'm not able reproduce it i'm not interested in trivial solutions, solved in practice saving files , re-cloning repository. i'm looking analysis of problem.

git merge-conflict-resolution