hi!
How do you solve:
$ git merge --no-ff --log PHP-5.4
Auto-merging Zend/zend_language_scanner.c
CONFLICT (content): Merge conflict in Zend/zend_language_scanner.c
Auto-merging Zend/zend_language_scanner_defs.h
CONFLICT (content): Merge conflict in Zend/zend_language_scanner_defs.h
Automatic me
Hi!
> $ git merge --no-ff --log PHP-5.4
> Auto-merging Zend/zend_language_scanner.c
> CONFLICT (content): Merge conflict in Zend/zend_language_scanner.c
> Auto-merging Zend/zend_language_scanner_defs.h
> CONFLICT (content): Merge conflict in Zend/zend_language_scanner_defs.h
> Automatic merge fail
On Wed, Mar 28, 2012 at 2:33 AM, Stas Malyshev wrote:
> Hi!
>
>> $ git merge --no-ff --log PHP-5.4
>> Auto-merging Zend/zend_language_scanner.c
>> CONFLICT (content): Merge conflict in Zend/zend_language_scanner.c
>> Auto-merging Zend/zend_language_scanner_defs.h
>> CONFLICT (content): Merge confl
Hi!
>> Why would these change every 2nd commit? These only should change when
>> you change the scanner, which happens very rarely.
>
> It depends what you do, but still annoying when it happens.
>
> But that does not answer the question...
Looking at the patch, it looks like yours and git's li
Pierre,
On Tue, Mar 27, 2012 at 5:43 PM, Stas Malyshev wrote:
> Hi!
>
> >> Why would these change every 2nd commit? These only should change when
> >> you change the scanner, which happens very rarely.
> >
> > It depends what you do, but still annoying when it happens.
> >
> > But that does not a
Hi,
2012/3/28 Stas Malyshev :
> Hi!
>
>>> Why would these change every 2nd commit? These only should change when
>>> you change the scanner, which happens very rarely.
>>
>> It depends what you do, but still annoying when it happens.
>>
>> But that does not answer the question...
>
> Looking at th
> Pierre,
>
> On Tue, Mar 27, 2012 at 5:43 PM, Stas Malyshev wrote:
>
> > Hi!
> >
> > >> Why would these change every 2nd commit? These only should change when
> > >> you change the scanner, which happens very rarely.
> > >
> > > It depends what you do, but still annoying when it happens.
> > >
>
Hi,
On Wed, Mar 28, 2012 at 11:48 AM, Niel Archer
wrote:
> git config --global core.autocrlf true
>
> Global option obviously makes this apply to all repoes, not sure how it
> applies without it, as this is pretty much the only way to be able to
> work interoperably with Visual Studio.
Thanks
2012/3/28 Niel Archer
>
>
> git config --global core.autocrlf true
>
> Global option obviously makes this apply to all repoes, not sure how it
> applies without it, as this is pretty much the only way to be able to
> work interoperably with Visual Studio.
Stas mail about autocrlf:
http://www.mai
