{"thread":{"id":"15175","subject":"[PATCH] Added details about resolving conflicts","startedAt":"2008-08-22T22:49:13Z","lastAt":"2008-08-22T22:49:13Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"88222","messageId":"7vtzdc64ye.fsf@gitster.siamese.dyndns.org","threadId":"15175","inReplyTo":null,"subject":"[PATCH] Added details about resolving conflicts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-22T22:49:13Z","receivedAt":"2008-08-22T22:49:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"From: Dan Hensgen <dan@macbook.danhensgen.com>\nDate: Thu, 21 Aug 2008 23:32:00 -0400\nSubject: [PATCH] Added details about resolving conflicts\n\nSigned-off-by: Dan Hensgen <dan@methodhead.com>\n---\n\n * This was sent in private to me by mistake; redistributing it for wider\n   comments.\n\n Documentation/git-merge.txt |   24 ++++++++++++++++++------\n 1 files changed, 18 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 17a15ac..685e1fe 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -126,13 +126,25 @@ After seeing a conflict, you can do two things:\n    up working tree changes made by 2. and 3.; 'git-reset --hard' can\n    be used for this.\n \n- * Resolve the conflicts.  `git diff` would report only the\n-   conflicting paths because of the above 2. and 3.\n-   Edit the working tree files into a desirable shape\n-   ('git mergetool' can ease this task), 'git-add' or 'git-rm'\n-   them, to make the index file contain what the merge result\n-   should be, and run 'git-commit' to commit the result.\n+ * Resolve the conflicts.  Git will mark the conflicts in\n+   the working tree.  Edit the files into shape and\n+   'git-add' to the index.  'git-commit' to seal the deal.\n \n+You can work through the conflict with a number of tools:\n+\n+ * Use a mergetool.  'git mergetool' to launch a graphical\n+   mergetool which will work you through the merge.\n+\n+ * Look at the diffs.  'git diff' will show a three-way diff,\n+   highlighting changes from both the HEAD and remote versions.\n+\n+ * Look at the diffs on their own. 'git log --merge -p <path>'\n+   will show diffs first for the HEAD version and then the\n+   remote version.\n+\n+ * Look at the originals.  'git show :1:filename' shows the\n+   common ancestor, 'git show :2:filename' shows the HEAD\n+   version and 'git show :3:filename' shows the remote version.\n \n SEE ALSO\n --------\n"}]}