Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59191 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 91738 invoked from network); 28 Mar 2012 00:44:05 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 28 Mar 2012 00:44:05 -0000 Authentication-Results: pb1.pair.com header.from=smalyshev@sugarcrm.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=smalyshev@sugarcrm.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 67.192.241.193 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 67.192.241.193 smtp193.dfw.emailsrvr.com Linux 2.6 Received: from [67.192.241.193] ([67.192.241.193:50812] helo=smtp193.dfw.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 17/22-13163-3DE527F4 for ; Tue, 27 Mar 2012 19:44:05 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp19.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 9DB443C8985; Tue, 27 Mar 2012 20:44:00 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp19.relay.dfw1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 652673C8942; Tue, 27 Mar 2012 20:44:00 -0400 (EDT) Message-ID: <4F725ECF.7060702@sugarcrm.com> Date: Tue, 27 Mar 2012 17:43:59 -0700 Organization: SugarCRM User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: Pierre Joye CC: PHP internals References: <4F725C51.1020207@sugarcrm.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] git merge and generated files? From: smalyshev@sugarcrm.com (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 the patch, it looks like yours and git's line endings did not match, which may have caused the conflict. 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