1/14/2024[edited at: 1/16/2024]
Git rebase --continue
Tags: git
If there is some conflict between 2 branches that you want to rebase. Git will shows the error and then stop there. You need to resolve the conflict, doing git add, and use the command git rebase --continue to continue.
This command is new to me. Before learning this, I didn't know what to do if there is conflict. I knew that I can resolve the conflict, but what to do after that? Turn out, the rebase is not finish yet. You need this command to continue.