{"thread":{"id":"23197","subject":"Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]","startedAt":"2010-03-27T03:34:11Z","lastAt":"2010-03-27T03:34:11Z","messageCount":1,"participants":["Jon Seymour"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"137931","messageId":"2cfc40321003262034m7b543b16xbc281899dc7beba2@mail.gmail.com","threadId":"23197","inReplyTo":null,"subject":"Re: git gui: merge conflict display is misleading since it hides non-conflicting remote hunks [edit]","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2010-03-27T03:34:11Z","receivedAt":"2010-03-27T03:34:11Z","isPatch":false,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"| changed conflict --> __change___\n>\n> As a result, the user thinks that the only __change__ is the import\n> statement, and elects to resolve the commit in favour of the local\n> commit. This is the wrong thing to do because the remote hunk is then\n> lost to the history.\n>\n"}]}