{"thread":{"id":"2459","subject":"[PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation","startedAt":"2005-11-11T20:51:40Z","lastAt":"2005-11-27T21:16:07Z","messageCount":3,"participants":["Petr Baudis","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"11625","messageId":"20051111205140.5719.68724.stgit@machine.or.cz","threadId":"2459","inReplyTo":null,"subject":"[PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-11-11T20:51:40Z","receivedAt":"2005-11-11T20:51:40Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"That file, with the so valuable (and so confusing) tables describing\nthe precise resolution rules git-read-tree follows, silently sat in\nthe corner and almost noone knew about it (well, I didn't, at least).\nThis references it from the git-read-tree documentation, so that there\nis some chance that interested people will find it.\n\nSigned-off-by: Petr Baudis \n---\n\n Documentation/git-read-tree.txt | 6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex 7db5fb5..ff17bad 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -55,6 +55,12 @@ merge, a single tree merge if only 1 tre\n fast-forward merge with 2 trees, or a 3-way merge if 3 trees are\n provided.\n \n+The detailed listing of the precise automatic resolution rules\n+git-read-tree follows can be found in 'technical/trivial-merge.txt'.\n+It is in part redundant with what you will find below since the\n+fellow documenters cannot decide which of the descriptions is more\n+confusing and remove the other one.\n+\n \n Single Tree Merge\n ~~~~~~~~~~~~~~~~~\n"},{"id":"12792","messageId":"20051127124108.GB22159@pasky.or.cz","threadId":"2459","inReplyTo":"20051111205140.5719.68724.stgit@machine.or.cz","subject":"Re: [PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-11-27T12:41:08Z","receivedAt":"2005-11-27T12:41:08Z","isPatch":true,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Fri, Nov 11, 2005 at 09:51:40PM CET, I got a letter\nwhere Petr Baudis said that...\n> That file, with the so valuable (and so confusing) tables describing\n> the precise resolution rules git-read-tree follows, silently sat in\n> the corner and almost noone knew about it (well, I didn't, at least).\n> This references it from the git-read-tree documentation, so that there\n> is some chance that interested people will find it.\n> \n> Signed-off-by: Petr Baudis \n\nAny gripes, or just forgotten?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"12817","messageId":"7v1x11dc6g.fsf@assigned-by-dhcp.cox.net","threadId":"2459","inReplyTo":"20051127124108.GB22159@pasky.or.cz","subject":"Re: [PATCH] Reference technical/trivial-merge.txt in git-read-tree documentation","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-27T21:16:07Z","receivedAt":"2005-11-27T21:16:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Petr Baudis writes:\n\n> Dear diary, on Fri, Nov 11, 2005 at 09:51:40PM CET, I got a letter\n> where Petr Baudis said that...\n>> That file, with the so valuable (and so confusing) tables describing\n>> the precise resolution rules git-read-tree follows, silently sat in\n>> the corner and almost noone knew about it (well, I didn't, at least).\n>> This references it from the git-read-tree documentation, so that there\n>> is some chance that interested people will find it.\n>> \n>> Signed-off-by: Petr Baudis \n>\n> Any gripes, or just forgotten?\n\nWhat happened was that I thought I'd apply after rewording the\nsarcasm and maybe moving the existing table to the one in\ntechnical/ (or just removing the old table), and forgot about it.\n\nOne thing I do not like the table in technical/ is that it is\nharder to read as the \"case table\" than the original.\nAdmittedly, it is meant to describe more complex situation, so\nit _is_ harder to understand, but a major difference is that the\noriginal table was designed to decribe things orthogonally and\nyou did not have to read from top to bottom (any situation would\nhave fallen in one case no matter what order you checked the\ncondition for each case), while the updated table in technical/\n_must_ be read from top to bottom and take the first match, and\nthat was what made me feel reluctant to remove the existing one\nfrom the original document.\n"}]}