git rebase -i HEAD~2

The latest submission gei remote git server has an error, and after fixing it correctly, submit it to the remote git server again.
git rebase -i HEAD~2

Then in a line in the new edit box (the line that is to be merged into another line), delete pick and enter f. (newest item merges into previous item)

esc
:wq

last
git push for-master



Remarks: git rebase --abort
      git log
      git reset

Guess you like

Origin http://10.200.1.11:23101/article/api/json?id=326776916&siteId=291194637