{"thread":{"id":"8890","subject":"Re: [PATCH] git init: activate rerere by default","startedAt":"2007-07-06T12:03:31Z","lastAt":"2007-07-06T12:03:31Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"46612","messageId":"Pine.LNX.4.64.0707061303260.4093@racer.site","threadId":"8890","inReplyTo":"200707061112.l66BCb6w017186@mi1.bluebottle.com","subject":"Re: [PATCH] git init: activate rerere by default","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-07-06T12:03:31Z","receivedAt":"2007-07-06T12:03:31Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 6 Jul 2007, しらいしななこ wrote:\n\n> I am sorry, but I can't understand how [git rerere] works and how it is \n> useful, after reading the manual page of git-rerere three times.  Are \n> there \"rerere tutorial for stupid newbies\" document somewhere?  I \n> earlier created .git/rr-cache folder but I have not seen anything \n> interesting happened in my repository.\n\nThere is no tutorial. In fact, it should help your workflow seemlessly.\n\nSuppose that you rebase a lot, on top of an upstream who has conflicting \nchanges, and refuses (at least for a long time) to merge your work.\n\nWhat you usually do is work out the conflicts over and over again, often \nidentically. Basically for many conflicts (but not necessarily all!), you \nsay: \"Yes, I have seen that. My version is better.\"\n\nWhen rerere is enabled, it records the conflicting hunks (i.e. the parts \nbetween <<<<<<< ... ======= ... >>>>>>>) together with how you resolved \nit, and next time it sees the same conflicting hunks, it automatically \napplies your resolution.\n\nYou should still inspect if it makes sense, and therefore the merge will \nstill fail, even if all conflicts were automatically resolved.\n\nHth,\nDscho\n"}]}