Re: git merge and generated files?

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