Gracefully manage conflicts when pulling

[giltayar]

When doing a git pull (in the end) and there is a merge conflict in a package, gracefully manage that by somehow not pushing the change for that package, but pushing the change for the other packages.

Need to think about it, because I'm not sure it's even possible.