Re: [BUG] fatal error during merge From: Junio C Hamano <hidden> Date: 2016-06-15 22:45:39 "Anders Melchiorsen" [off-list ref] writes: Your patch got rid of the errors and it commits the merged tree. But the working tree is not updated correctly, so the moved file disappears. Isn't this a long known breakage of D/F conflict check logic in merge-recursive backend?
Keyboard shortcuts hback out one level jnext message in thread kprevious message in thread ldrill in Escclose help / fold thread tree ?toggle this help