Return and track affected and culprit on conflicts#39

konstin merged 1 commit intomainastral-sh/pubgrub:mainfrom

konsti/incompat-trackerastral-sh/pubgrub:konsti/incompat-trackerCopy head branch name to clipboard