{"thread":{"id":"23196","subject":"git gui: merge conflict display is misleading since it hides non-conflicting remote hunks","startedAt":"2010-03-27T02:20:42Z","lastAt":"2010-03-27T02:20:42Z","messageCount":1,"participants":["Jon Seymour"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"137929","messageId":"2cfc40321003261920k5b649eeeybeb84e1dbcb7787@mail.gmail.com","threadId":"23196","inReplyTo":null,"subject":"git gui: merge conflict display is misleading since it hides non-conflicting remote hunks","fromName":"Jon Seymour","fromEmail":"jon.seymour@gmail.com","sentAt":"2010-03-27T02:20:42Z","receivedAt":"2010-03-27T02:20:42Z","isPatch":false,"sender":{"key":"jon.seymour@gmail.com","avatar":"https://avatars.githubusercontent.com/u/207131?v=4"},"body":"In v1.6.6.1 of git (cygwin build), git gui has behaviour that I\nbelieve is misleading in the presence of merge conflicts.\n\nIn the case in point the file being merged had diverged from the base\nin both the local and remote repos.\n\nThe main hunks in each change merged cleanly, but there was a trivial\nconflict on one line.\n\nIn GIT gui this was rendered as:\n\n   <<<<<<< HEAD\n   +import someclass;\n   =======\n   >>>>>>> remote\n\nGIT GUI did not render the the interesting hunk from the remote that\nmerged cleanly.\n\nAs a result, the user thinks that the only conflict is the import\nstatement, and elects to resolve the commit in favour of the local\ncommit. This is the wrong thing to do because the remote hunk is then\nlost to the history.\n\nOn the other hand, if the user manually resolves the conflict with an\neditor and then rescans, the resolution of the conflict is shown, but\nthe remote hunk is not shown. Only if the user then adds the resolved\nfile to the index, does the remote hunk display in GIT GUI.\n\nIn my view, the current behaviour of git gui when displaying merge\nconflicts is misleading because the display falsely leads the user\ninto the mistaken believing that the only change in the remote is the\nconflict when, in fact, this is not true.\n\nIs there any good reason why GIT gui can't show the full diff between\nthe working tree file and the current HEAD?\n\njon.\n"}]}