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:
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
.
I tend to favor the first approach because:
master
to a feature branch)
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.