Остановите Rebase git
git rebase --abort
Kevin
git rebase --abort1.You can run git rebase --abort to completely undo the rebase. Git will return you to your branch's state as it was before git rebase was called.
2.You can run git rebase --skip to completely skip the commit. ...
3.You can fix the conflict.