Messages in this thread | | | Date | Thu, 15 Oct 2020 13:17:12 +0200 | From | Joerg Roedel <> | Subject | Re: [git pull] IOMMU Updates for Linux v5.10 |
| |
On Wed, Oct 14, 2020 at 12:15:55PM -0700, Linus Torvalds wrote: > As a result, "git show" doesn't ever really understand the notion of a > "merge conflict", and all it shows is really "whee, this end result > looks like neither side" as a kind of pseudo-conflict diff.
Ah okay, that makes sense. Thanks for the explanation.
> Anyway, thanks for the describing the conflict, it was indeed not > complicated, this email is just to explain your "but somehow git > [show|log] didn't show it to me" thing.
Yeah, next time I try to get the diff before commiting the merge, that probably works better. A diff is better than describing conflict resolutions verbally.
Regards,
Joerg
| |