Hi Derick,
On Thu, August 28, 2014 17:23, Derick Rethans wrote:
> On Fri, 22 Aug 2014, Derick Rethans wrote:
>
>
>> On Fri, 22 Aug 2014, Anatol Belski wrote:
>>
>>
>>> as there are many data type changes, here's an idea on how to simplify
>>> the merges. Git supports custom merge drivers which att
On Aug 22, 2014 1:39 PM, "Derick Rethans" wrote:
>
> On Fri, 22 Aug 2014, Anatol Belski wrote:
>
> > as there are many data type changes, here's an idea on how to simplify
> > the merges. Git supports custom merge drivers which attracted my
> > attention, so I've ended up with the following trick:
Just implement and show it working, then i'd say the guys will react.
28 авг. 2014 г. 18:24 пользователь "Derick Rethans"
написал:
> On Fri, 22 Aug 2014, Derick Rethans wrote:
>
> > On Fri, 22 Aug 2014, Anatol Belski wrote:
> >
> > > as there are many data type changes, here's an idea on how to
>
On Fri, 22 Aug 2014, Derick Rethans wrote:
> On Fri, 22 Aug 2014, Anatol Belski wrote:
>
> > as there are many data type changes, here's an idea on how to
> > simplify the merges. Git supports custom merge drivers which
> > attracted my attention, so I've ended up with the following trick:
>
>
On Fri, 22 Aug 2014, Anatol Belski wrote:
> as there are many data type changes, here's an idea on how to simplify
> the merges. Git supports custom merge drivers which attracted my
> attention, so I've ended up with the following trick:
As there are that many differences, does it still make se
Hi,
as there are many data type changes, here's an idea on how to simplify the
merges. Git supports custom merge drivers which attracted my attention, so
I've ended up with the following trick:
=== Add to .git/config ===
[merge "7"]
name = Compatibility merge between PHP5 and PHP7
driver
