git-rerere during git-rebase

From: Ilpo Järvinen <hidden>
Date: 2016-06-15 22:42:34

Hi,

I discovered that "git-am --resolved --3way" (in 1.3.1) and "git-rebase 
--continue" (in 1.4.2.rc1.ge7a0) do not correctly capture hand resolved 
files into .git/rr-cache. In worst case I got (with 1.3.1), afaict, the 
postimage was incorrect including also all patches successfully applied 
after the git-am --resolved --3way up to until the point where next 
conflict occurred. To circumvent this, I can use git-rerere directly but I 
remember that its manpage states that one should never have to do so. I'm 
I missing something or is this a problem in git-rebase (or possibly in 
git-am)?


-- 
 i.

ps. I'm not subscribed, so please cc me.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help