baseIt means root. The
so-called root is the intersection of two branches. Below the intersection is shared by the two branches.
There is a misunderstanding that the part below the intersection only belongs to a certain branch.
Three major commands
1) git rebase -i upstream [branch]
upstream is the base to be transplanted to, which can be branch or commit id.
branch is the branch to be transplanted, and the default is the branch where HEAD is located
2). git rebase -i --onto upstream branch childbranch
1) Command enhanced version
3) git reabse --continue --abort
When using the -iinteractive mode, the processing of conflict will be interrupted, and you must use it --continueto restore the interactive mode