Git/source樹將分支B的特定提交移動到分支A

Question

我在開發時遇到意外。我有兩次提交這就需要在分支A，但我推到分支B.所以，現在，我想搬到那些致力於分支A，然後從分行B.刪除，請查看圖片查看詳細：

Answer 1

首先，請到branchA和cherry-pick這兩個提交你想在這裏選擇。

$ git checkout branchA 
$ git cherry-pick <commit1>  # commit1 = 0a18e0f 
$ git cherry-pick <commit2>  # commit2 = e604ce4 

$ git push origin HEAD   # push to remote 

現在，通過revert或rebase刪除branchB的兩次提交。回覆更好，因爲它不會改變git歷史。

還原：

$ git checkout branchB 
$ git revert <commit1> 
$ git revert <commit2> 
$ git push origin HEAD 

再次基於：

$ git checkout branchB 
$ git rebase -i efb2443   # go back to the commit before the two commmits you want to remove 

Now comment out (adding `#` before the commit hash) the two commits you want to remove. 

$ git push -f origin HEAD  # you need to force(-f) push as history is changed here by rebasing