Hi Alan and Dave
Some specific comments first, then some general ones after.
>Fundamentally, the git world is split on the rebase-only
>versus merge-only question
As it happens I fall in the merge camp. But for the work we have been
doing up to now I don't feel there has been much difference eith
On May 23, 2015, at 1:14 PM, Alan W. Irwin wrote:
> I think we just have to agree to disagree on this issue.
I agree! :-)
> Fundamentally, the git world is split on the rebase-only
> versus merge-only question, and we just happen to fall in different
> camps.
To be honest, this prompte
Hi, Phil,
On May 24, 2015, at 1:37 AM, Phil Rosenberg wrote:
> I'm not sure this is right, but I would assume that if we apply a bug
> fix to the v5 branch then create a patch of this commit and apply that
> to the v6 branch then if we ever merge (or rebase) the branches then
> git is clever enou
Hi Phil:
This is long, but you have given me lots to respond to. :-)
On 2015-05-24 09:37+0100 Phil Rosenberg wrote:
> Hi Alan and Dave
>
> Some specific comments first, then some general ones after.
>
>> Fundamentally, the git world is split on the rebase-only
>> versus merge-only question
> As
