{"thread":{"id":"4928","subject":"git-rerere during git-rebase","startedAt":"2006-07-20T14:14:25Z","lastAt":"2006-07-20T14:14:25Z","messageCount":1,"participants":["Ilpo Järvinen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"23955","messageId":"Pine.LNX.4.58.0607201702010.3746@kivilampi-30.cs.helsinki.fi","threadId":"4928","inReplyTo":null,"subject":"git-rerere during git-rebase","fromName":"Ilpo Järvinen","fromEmail":"ilpo.jarvinen@helsinki.fi","sentAt":"2006-07-20T14:14:25Z","receivedAt":"2006-07-20T14:14:25Z","isPatch":false,"sender":{"key":"ilpo.jarvinen@helsinki.fi","avatar":null},"body":"Hi,\n\nI discovered that \"git-am --resolved --3way\" (in 1.3.1) and \"git-rebase \n--continue\" (in 1.4.2.rc1.ge7a0) do not correctly capture hand resolved \nfiles into .git/rr-cache. In worst case I got (with 1.3.1), afaict, the \npostimage was incorrect including also all patches successfully applied \nafter the git-am --resolved --3way up to until the point where next \nconflict occurred. To circumvent this, I can use git-rerere directly but I \nremember that its manpage states that one should never have to do so. I'm \nI missing something or is this a problem in git-rebase (or possibly in \ngit-am)?\n\n\n-- \n i.\n\nps. I'm not subscribed, so please cc me.\n"}]}