gitconflictrebase

How can I tell how far into a git rebase I am when resolving conflicts?

I am rebasing in git and am encountering many conflicts. I address each one and do git rebase --continue, only to be met with the next conflict. How can I see how close I am to successfully completing the rebase?

Solution

  • I'm not sure if you can get a measure of how far you have to go, but it lists how many commits into the rebase you are. In the error output is a line that looks like

    Patch failed at 0003 <commit message>

    0003 means you're three commits into the rebase.