* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > I couldn't find an example of that in a quick look, it's > fairly uncommon to have non-conflicting merges that had > semantic - but not contextual - conflicts. [...] This: git log --grep='Semantic merge\|Semantic conflict' gives over a dozen examples of such semantic merges I've done in the past 4 years. I fully agree that they are best done in the merge commit - in hindsight perhaps with a tad more explanation than I did. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
