On 2011-11-09 18:48, Adam Williamson wrote: > thanks both of you; I hadn't really thought about the consequences of > merging vs. cherry-picking, I think I'd just cargo-culted from somewhere > the idea of using git merge instead of manually re-doing changes without > considering cherry-picking instead. so I guess in general it's both a > better idea and more likely to work to use cherry-pick instead of merge, > unless the two branches are really expected to be identical? FWIW, that is the way I approach it. If several branches are in sync (or nearly so) then merging makes more sense to me. But if the branches diverge then merging from the rawhide branch to a maintenance branch makes little sense, making cherry-picking the better choice. -- devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/devel
