[英]merging changes from master into a published feature branch
If there are multiple developers working on a feature branch, and we need to periodically bring in changes from master, there are two approaches that I know of: 如果有多个开发人员在功能分支上工作,并且我们需要定期从master进行更改,那么我知道有两种方法:
my questions: 我的问题:
Yes. 是。
yes, unless you rebase with the --preserve-merge option , those merge commit would still be there, but without any parent on master
. 是的,除非您使用--preserve-merge选项进行变基 ,否则那些合并提交仍将存在,但是
master
上没有任何父项。
I tend to favor the first approach because: 我倾向于第一种方法,因为:
master
to a feature branch) master
到Feature分支)
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.