Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:59192
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.212.182 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <4F725ECF.7060702@sugarcrm.com>
References: <CAEZPtU47-TtGQbKHPkWA=pMpQUf8QBB1qxW6JGunC3KUuzZ-iQ@mail.gmail.com>
	<4F725C51.1020207@sugarcrm.com>
	<CAEZPtU6JVh53Sb0QHrmBTwJPGg_aRdzrA39j4-MB9CcMG-sPEQ@mail.gmail.com>
	<4F725ECF.7060702@sugarcrm.com>
Date: Tue, 27 Mar 2012 17:54:00 -0700
Message-ID: <CAKOpQSzuXXNJN1=n_EnPqG-U-xBou5t+MjcnNcWR59SV+cGs1A@mail.gmail.com>
To: Stas Malyshev <smalyshev@sugarcrm.com>
Cc: Pierre Joye <pierre.php@gmail.com>, PHP internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=0016e6dd898d029e6a04bc430b7f
Subject: Re: [PHP-DEV] git merge and generated files?
From: kris.craig@gmail.com (Kris Craig)

--0016e6dd898d029e6a04bc430b7f
Content-Type: text/plain; charset=ISO-8859-1

Pierre,

On Tue, Mar 27, 2012 at 5:43 PM, Stas Malyshev <smalyshev@sugarcrm.com>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 answer the question...
>
> Looking at the patch, it looks like yours and git's line endings did not
> match, which may have caused the conflict.


Stas is right.  Looks like the Windows CR line endings are causing it to
puke on ya.  I'm assuming you're working in Windows, right?  What Git
client are you using?

If you're using Msysgit, it automatically converts these line endings for
you specifically to avoid this problem, but you have to select that option
during the installation process when it prompts you.  I don't know if the
setting can be changed after install; my guess would be it can, but I have
no idea how.  The easiest thing to do would be to just re-run the Msysgit
installer (if that's what you're using) and when prompted select the option
to auto-convert line endings (i.e. I think the option is something along
the lines of "Use Unix-Style line endings").

--Kris



> I think it'd be also the best
> to resolve such conflicts by leaving the files as-is, maybe just by
> using git reset or using git mergetool and choosing the "old" variant.
> Depending on the system mergetool would use different tools so I'm not
> sure which one would be best on yours. I usually just use mergetool,
> mark every change to resolve to "old" variant and that cleans up the
> commit.
> --
> Stanislav Malyshev, Software Architect
> SugarCRM: http://www.sugarcrm.com/
> (408)454-6900 ext. 227
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>

--0016e6dd898d029e6a04bc430b7f--