Merging two separate feature branches into the same main branch [duplicate]
问题 This question already exists : How to merge 2 feature branches towards a release Closed 3 years ago . We are working towards a release: 2 remote feature branches: F2 and F3 How do we deal with F3 to create the release? Proposal 1 : Simply merge F3 into development. Proposal 2 : First merge development into F3 (including the F2 changes), then merge into development. What are the practical differences between these two methods? Is there an objective reason to prefer one over the other? Blue =