解决了重新设置分支机构的所有冲突后，我执行了“ git rebase --continue”，并且得到了“是否没有进行重新设置？”。 接下来我该怎么办？

Question

I am trying to rebase my branch with my develop branch. In the process of resolving conflicts and git rebase --continue I ended up to a point where I am done resolving everything and I did git rebase --continue again

pragyagoel$ git rebase --continue
No rebase in progress?
pragyagoel$

On git status it gives me following:

pragyagoel$ git status
On branch Pragya_Develop_2
Your branch and 'origin/Pragya_Develop_2' have diverged,
and have 64 and 9 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean
pragyagoel$

Not sure what I am supposed to do next as its as I have no place to response to "No rebase in progress?". It directly goes to new command line.

Answer 1

It looks to me like your rebase completed successfully.

If you run

git log --graph --decorate Pragya_Develop_2 origin/Pragya_Develop_2

it should show you your rebased commits in branch Pragya_Develop_2 , which have diverged from origin/Pragya_Develop_2 precisely because you've done the rebase.

If you are happy with the result and want to update the branch on origin with the rebased one, you can now do git push -f .

Caveat: there are a lot of good reasons to avoid pushing the results of a rebase, but to use a merge instead. I recommend reading up on that (google "git rebase vs merge" to find dozens of pages on the topic), but here I am answering your question as asked, assuming that rebase really is what you want to do.