git - 如果最新提交已被修改,我如何将一些提交应用到主分支?
问题描述
我有一个master
分支,比如 3 个提交:
A -> B -> C
我从它分支出来,现在我有一个develop
包含 6 个提交的分支:
A -> B -> C -> D -> E -> F
创建分支后develop
,在master
分支中我C
使用git commit --amend
. 现在我想在分支中应用D
提交。自从从与 on 略有不同的提交开始以来,我如何做到这一点而不会造成太多混乱?F
master
D
master
解决方案
It can be done like this:
git checkout master
git cherry-pick other-branch~3..other-branch # apply the last 3 commits from the other branch
That should do.
推荐阅读
- javascript - jQuery 验证不验证我的 textarea 元素
- java - Return statement in test method
- apache-flink - How to join three or more datastreams /tables on a given key and a common window by datastrem API or Flink Table API/SQL?
- mongodb - Error $gte time error in mongodb
- azure-cosmosdb - cosmos db RequestRateTooLargeException
- ruby - Print/Export GUI interface at current state Ruby Shoes
- python-3.x - prepending relative links to absolute links in python
- php - cakeEmail getaddrinfo failed: No such host is known
- r - Why is ROC not representative of Neural Net model in R
- reactjs - 如何在 react-native 中设置 ComponentDidUpdate 中的道具值?