为啥GitHub上建了分支后，git status会有rebase in progress; onto ……这种问题

Question

为啥GitHub上建了分支后，git status会有rebase in progress; onto ……这种问题？ 该怎么解决？

Answer 1

This is not a problem or an error. . . The truth is that you have used git rebase before or just now, but the last process has not been completed yet.

Open the file(s) with "both added", it will use

>>>>>>><commitHash>
xxxx
<<<<<<<
xxxx
>>>>>>>HEAD

This form will remind you where conflicts occur. After you solve it, git add .，然后 git rebase --continue you can move on to the next step. If you still have conflicts to deal with, just keep doing it.

Of course, you can also git rebase --abort 来取消目前的进程。根据截图，猜不出你什么时候用过 rebase，因为如果是按你描述的，新建一个 branch，是不会调用 rebase directly