On Wed, 4 May 2016 17:30:39 -0700 (PDT)
Moi <myon...@gmail.com> wrote:
> *These per-customer branches contain customer-specific customizations
> and receive "integration merges" from the "pristine" branch when
> -- typically when a new bug fix or a feature gets implemented there.
> what does "integration merges" mean? Does it mean cherry pick those
> fixes from "pristine" branch to the per-customer branches?
In addition to what Gergely said, note that Git is good at detecting
code changes appeared in a code base via different means, so it's okay
to, say, cherry pick a change and later merge the branch from which you
have cherry-picked -- that won't produce a conflict even though the
same pile of changes would be about to applied again.
Repeated merges are okay, too. Hence all other things equal, I'd go
with merges, too.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/d/optout.