[lkml]   [2012]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: [git patches] libata updates

* Linus Torvalds <> 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. [...]


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.



 \ /
  Last update: 2012-07-26 10:21    [W:0.092 / U:5.272 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site