I'm not sure how to apply conflicting patches with Magit.  Good
question, I'd like to know how to do it too! :)

-- 
Pierre Neidhardt
https://ambrevar.xyz/