Resolving a git rebase issue -

Resolving a git rebase issue -

coworker has checked-in changes branch both work on. first did git add together , git commit , did git pull --rebase said there conflicts, opened text editor , resolved conflicts , 1 time again did git add together . , git commit , git rebase --continue

but @ point message, if git rebase --continue 1 time again same message. stuck on this, next step should ?

i think error running git commit after resolving rebase.

when encounter conflict, should following:

resolve conflict stage files (git add together ...) continue rebase. (git rebase --continue)

there's no need commit between steps 2 , 3.

git