Hi all, I am merging some changes from trunk in my local feature branch MAHOUT-944 and I have problems with line endings.
When merging I do 'Accept theirs' in IntelliJ for all files since I haven't touched them for my feature. When committing I get a dialog saying there are differences in line endings and I could convert the files or leave it as is. No matter what I choose when I commit and do a diff I get this huge patch with changes that have nothing to do with my actual patch. They shouldn't be in the diff because trunk has them and my branch has them as well. The diffs shows a minus for every line in these files and then the same file with a plus in front even though I haven't touched them at all. Any ideas how to solve this? Cheers, Frank
