Messages in this thread | | | Date | Wed, 1 Jun 2011 22:41:56 +0200 | From | Jens Axboe <> | Subject | Re: [PATCH] ide: Fix bug caused by git merge |
| |
On 2011-06-01 22:27, Linus Torvalds wrote: > Jens, you really can't do that. When you see a conflict marker, you > need to look at WHY. The conflict may well be because of removed lines > rather than added lines, the correct resolution is NOT necessarily to > just take everything within the conflicting region.
Of course I look at the conflicts. I don't know what happened in this case. Contrary to what you think, I do do regular merges. Usually not in external branches, and if I do, it's only to resolve non-trivial conflicts.
And I don't know why this one got so screwed up, well reversed really.
-- Jens Axboe
| |