$gitcheckoutmasterAlreadyon'master'$gitrebasedevFirst,rewindingheadtoreplayyourworkontopofit...Applying:task:001-commit1Usingindexinfotoreconstructabasetree...Fallingbacktopatchingbaseand3-waymerge...Auto-mergingindex.htmlCONFLICT (add/add): Merge conflict in index.htmlerror:Failedtomergeinthechanges.hint:Use'git am --show-current-patch'toseethefailedpatchPatchfailedat0001task:001-commit1Resolveallconflictsmanually,markthemasresolvedwith"git add/rm <conflicted_files>",thenrun"git rebase --continue".Youcaninsteadskipthiscommit:run"git rebase --skip".Toabortandgetbacktothestatebefore"git rebase",run"git rebase --abort".
# This is a combination of 3 commits.# This is the 1st commit message:task:256-test# This is the commit message #2:task(▒~U~J): 256-test# This is the commit message #3:task:002-commit2
这里需要我们调整提交记录,可以只保留一条,修改后保存。
[detached HEAD 613b00c] task: 256-testDate:SatOct1218:23:222019+08003fileschanged,12insertions(+),1deletion(-)createmode100644index.htmlSuccessfullyrebasedandupdatedrefs/heads/dev.