{"thread":{"id":"21825","subject":"What is the status of merging with whitespace conflicts?","startedAt":"2009-12-02T10:34:16Z","lastAt":"2009-12-02T17:04:58Z","messageCount":2,"participants":["Martin Langhoff","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"128996","messageId":"46a038f90912020234g3094cccbxd8ca80c7c0b32ca4@mail.gmail.com","threadId":"21825","inReplyTo":null,"subject":"What is the status of merging with whitespace conflicts?","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2009-12-02T10:34:16Z","receivedAt":"2009-12-02T10:34:16Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"A project I hack on [Moodle] is relatively lax when it comes to\ntrailing whitespace (relatively: we clean it up when we spot it,\nsometimes ws sneaks in!).\n\nMost of the time, this has no impact. If you have done some whitespace\ncleanups on your branch, however, merging from upstream means endless,\npointless conflicts. Looking at the git merge manpage, and searching\nthe archives doesn't show anything promising.\n\nPerhaps we have a merge tool that makes it easy to spot-and-resolve\npure whitespace conflicts? In the middle of the merge, there _are_\nsome actual code conflicts, but it's hard to see them...\n\ncheers,\n\n\nm\n-- \n martin.langhoff@gmail.com\n martin@laptop.org -- School Server Architect\n - ask interesting questions\n - don't get distracted with shiny stuff  - working code first\n - http://wiki.laptop.org/go/User:Martinlanghoff\n"},{"id":"129018","messageId":"7vy6lli9xh.fsf@alter.siamese.dyndns.org","threadId":"21825","inReplyTo":"46a038f90912020234g3094cccbxd8ca80c7c0b32ca4@mail.gmail.com","subject":"Re: What is the status of merging with whitespace conflicts?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-12-02T17:04:58Z","receivedAt":"2009-12-02T17:04:58Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I am not working on it, and I didn't hear from anybody who is.  If you\nlimit the whitespace-only changes to the ones that do not cross line\nboundary, it wouldn't be too hard to add.  Probably it would take less\nthan one summer for a good student.\n"}]}