rebase in progress. Cannot commit. How to proceed or stop (abort)?

Posted by

Step 1:

Keep going git rebase --continue

Step 2:

fix CONFLICTS then git add .

Step 3 :

Back to step 1, now if it says no changes .. then run git rebase --skip and go back to step 1

Step 4 :

If you just want to quit rebase run git rebase --abort

Step 5 :

Once all changes are done run git commit -m "rebase complete" and you are done.

Subscribe
Notify of
guest
0 Comments
Inline Feedbacks
View all comments
0
Would love your thoughts, please comment.x
()
x