OriginalLess than 1 minute
git rebase <branch>
git rebase --abort
Continue rebasing after conflict resolution
git rebase --continue
The rebase operation can organize the local unpush fork submission history into a straight line;
The purpose of rebase is to make it easier for us to see changes in historical commits, since forked commits require a three-way comparison.