Re: [git-users] How to implement White Label using Git

2016-05-05 Thread Konstantin Khomoutov 
On Wed, 4 May 2016 17:30:39 -0700 (PDT)
Moi  wrote:

> "
> *These per-customer branches contain customer-specific customizations 
> and receive "integration merges" from the "pristine" branch when
> needed 
> -- 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 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] How to implement White Label using Git

2016-05-05 Thread Gergely Polonkai 
…or merge, or rebase, whatever way you can get pristine’s changes to
vendor. This all depends on your workflow. If you don’t have one, I would
go with merges.



Gergely Polonkai
[image: https://]about.me/gergely.polonkai


2016-05-05 2:30 GMT+02:00 Moi :

> "
>
> *These per-customer branches contain customer-specific customizations
> and receive "integration merges" from the "pristine" branch when needed
> -- 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?
>
> On Wednesday, May 4, 2016 at 10:14:56 PM UTC+8, Konstantin Khomoutov wrote:
>>
>> On Tue, 3 May 2016 06:25:19 -0700 (PDT)
>> Moi  wrote:
>>
>> > Can we make use of Git to implement White Label concept?
>> > Eg, I have a product that are sold to customer A and customer B. If
>> > customer B needs to customize on some screens which customer A
>> > doesn't need, how do I implement the white label using Git?
>>
>> This task is not specific to Git and is commonly known as "vendor
>> branches", so just google this term.
>>
>> In short, and in the simplest case, you have a branch which contains
>> the "pristine" version of your codebase -- that is, with no
>> per-customer customizations.  Then for each customer you have their own
>> branch forked off that "pristine" branch.
>> These per-customer branches contain customer-specific customizations and
>> receive "integration merges" from the "pristine" branch when needed --
>> typically when a new bug fix or a feature gets implemented there.
>>
>> Sure, the scheme could be more complicated like maintaining several
>> "pristine" branches when different customers having different versions
>> of your codebase deployed to them but the basic idea holds.
>>
> --
> 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 to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

-- 
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 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] How to implement White Label using Git

2016-05-04 Thread Moi 
"

*These per-customer branches contain customer-specific customizations 
and receive "integration merges" from the "pristine" branch when needed 
-- 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?

On Wednesday, May 4, 2016 at 10:14:56 PM UTC+8, Konstantin Khomoutov wrote:
>
> On Tue, 3 May 2016 06:25:19 -0700 (PDT) 
> Moi  wrote: 
>
> > Can we make use of Git to implement White Label concept? 
> > Eg, I have a product that are sold to customer A and customer B. If 
> > customer B needs to customize on some screens which customer A 
> > doesn't need, how do I implement the white label using Git? 
>
> This task is not specific to Git and is commonly known as "vendor 
> branches", so just google this term. 
>
> In short, and in the simplest case, you have a branch which contains 
> the "pristine" version of your codebase -- that is, with no 
> per-customer customizations.  Then for each customer you have their own 
> branch forked off that "pristine" branch. 
> These per-customer branches contain customer-specific customizations and 
> receive "integration merges" from the "pristine" branch when needed -- 
> typically when a new bug fix or a feature gets implemented there. 
>
> Sure, the scheme could be more complicated like maintaining several 
> "pristine" branches when different customers having different versions 
> of your codebase deployed to them but the basic idea holds. 
>

-- 
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 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] How to implement White Label using Git

2016-05-04 Thread Konstantin Khomoutov 
On Tue, 3 May 2016 06:25:19 -0700 (PDT)
Moi  wrote:

> Can we make use of Git to implement White Label concept?
> Eg, I have a product that are sold to customer A and customer B. If 
> customer B needs to customize on some screens which customer A
> doesn't need, how do I implement the white label using Git?

This task is not specific to Git and is commonly known as "vendor
branches", so just google this term.

In short, and in the simplest case, you have a branch which contains
the "pristine" version of your codebase -- that is, with no
per-customer customizations.  Then for each customer you have their own
branch forked off that "pristine" branch.
These per-customer branches contain customer-specific customizations and
receive "integration merges" from the "pristine" branch when needed --
typically when a new bug fix or a feature gets implemented there.

Sure, the scheme could be more complicated like maintaining several
"pristine" branches when different customers having different versions
of your codebase deployed to them but the basic idea holds.

-- 
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 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] How to implement White Label using Git

2016-05-03 Thread Magnus Therning 

Moi  writes:

> Can we make use of Git to implement White Label concept?
> Eg, I have a product that are sold to customer A and customer B. If 
> customer B needs to customize on some screens which customer A doesn't 
> need, how do I implement the white label using Git?

I'm guessing you have used a Version Control System to implement White
Label in the past then. Would you mind telling us what VCS you used and
how you implemented White Label then?

/M

-- 
Magnus Therning  OpenPGP: 0x927912051716CE39
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe   http://therning.org/magnus

Failure is not an option. It comes bundled with the software.

-- 
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 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[git-users] How to implement White Label using Git

2016-05-03 Thread Moi 
Can we make use of Git to implement White Label concept?
Eg, I have a product that are sold to customer A and customer B. If 
customer B needs to customize on some screens which customer A doesn't 
need, how do I implement the white label using Git?

-- 
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 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.