Pierre, On Tue, Mar 27, 2012 at 5:43 PM, Stas Malyshev <smalys...@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 > >
