solver: enforce conflicts during upgrades and new pkg installs
This makes sure any conflicted packages will be removed first. Useful if we know there are conflicting files, and want to avoid adding potentially harmful replaces line. Add a test case for this too.
Showing with 61 additions and 2 deletions