Re: [git patches] libata updates

Ingo Molnar
2012-07-26T07:44:31Z

* Linus Torvalds <torvalds@linux-foundation.org> 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