4 ms·
The irony here is that all of the large git projects I've worked on don't use merges at all. They cherry-pick and/or rebase their patches around.
by brandmeyer 7y ago
The irony here is that all of the large git projects I've worked on don't use merges at all. They cherry-pick and/or rebase their patches around.
- erikpukinskis 7y agoYeah, I never merge. No idea why you would want to.
- gimboland 7y agoCherry-picks can still lead to conflicts though, no? It's essentially just a particular kind of merge.
- brandmeyer 7y agoMy mental model is that cherry-picks are like a copy by-value of one or more patches. A merge is a copy by-reference of a specific series of patches. It just so happens that what I usually want in practice is to make copies by-value. There are other integration workflows that make copies by-reference with dedicated merge commits. But my team's most common use case for long-lived branches is to track bugfixes for deployment to remote hardware separately from mainline development. So, by-value copies of small changes is much more common.