Marc Singer <elf@xxxxxxxxx> writes: >> git merge "Merge with Linus" work linus >> >> instead, which will use the proper "recursive" merge functionality. > > OK. I'll see if that is more successful. It would be nice if the > resolve command printed a message about the command being deprecated. The only reason I didn't do that was because I just did not want to disrupt the workflow by Linus. If nobody in the upper echelon of kernel people (meaning, longest-time git users) use git-resolve anymore, I think we should mark it deprecated and remove it eventually. - : 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