{"thread":{"id":"4913","subject":"No trailing newline and bogus conflicts","startedAt":"2006-07-18T02:39:48Z","lastAt":"2006-07-18T02:39:48Z","messageCount":1,"participants":["Martin Langhoff"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"23917","messageId":"46a038f90607171939l21d986efgca1cadf0817c0229@mail.gmail.com","threadId":"4913","inReplyTo":null,"subject":"No trailing newline and bogus conflicts","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2006-07-18T02:39:48Z","receivedAt":"2006-07-18T02:39:48Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"Hi!\n\nI am seem to be having problems merging and cherry-picking patches on\nfiles that have no trailing newlines. Not having a trailing newline is\nbad style, but some (arguably braindead) languages and text file\nformats actually expect it. (Alas, to be burdened with PHP syntax.)\n\nI may be doing something wrong, but I've had two merges in a row where\ngit seemed to think that there was conflict or different at the bottom\nof the file, where there wasn't.\n\nFor example if you clone\nhttp://git.catalyst.net.nz/git/moodle.git#mdl-artena-tairawhiti\n(~180MB) and you look around these two merges:\n\n  bae5c70f0dc97d1c5a59ec2c9278d06f7427db71\n  bcfc1924516baa48d6e07eb125a1cb4f39d76dfa\n\nyou will see that I cherry-picking patches to auth/db/lib.php --\nhowever I forgot one patch and tried to fix things up in a branch and\nmerge it in. The last line, though identical, was always reported as\n\"different\" between the 2 files when I was resolving bcfc19.\n\nAnd later, when working on bae5c, I suspect I shouldn't have seen a\nconflict, as both sides had changed exactly the same.\n\nAny ideas other than dropping PHP?\n\n\nmartin\n"}]}