Fix git replacement problem

Question

The employee checked their changes in the branch on which we work. First I did git add and git commit , and then I did git pull --rebase
who said there are some conflicts. So I opened a text editor and resolved these conflicts, and again I did git add . and git commit git add . and git commit , and then git rebase --continue

But at this point I get this message, if I say git rebase -continue again, I get the same message. Stuck on this, what is the next step I should take?

Answer 1

I think your error was executed by git commit after rebase resolved.

When you encounter a conflict, you should do the following:

• to resolve a conflict
• group files ( git add ... )
• continue rebooting. ( git rebase --continue )

There is no need to perform operations between steps 2 and 3.