Please don't cull Cc list; use "Reply to all" in your MUA. Am 4/11/2011 17:15, schrieb Hrvoje NikÅiÄ: > I still wonder why rerere is necessary here. After all, even without > the rerere metadata, the information about conflict resolution is > right there, in the merge commit, and rebase could conceivably make > use of it. What am I missing? The conflicts that you see during a merge may be attributed to several different commits of the merged branch. Therefore, when you rebase the branch, you will see different subsets of the conflicts for each rebased commit, and it is possible that you see conflicts that you did not see in the merge. How can you expect rebase to "know" how to resolve them? -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html