All right, I see. The conflict error message was confusing me: ------------------------------------------------------------------------ fatal: Entry 'azerty' would be overwritten by merge. Cannot merge. Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. When commiting, use the option '-c c17532f' to retain authorship and message. ------------------------------------------------------------------------ The last sentence does not make much sense when -x is specified. Cheers, -- Jean-Baptiste Quenot http://caraldi.com/jbq/blog/ -- 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
