Conflict resolution: eviction

[jastice]

The simplest way to deal with conflicting versions might be eviction of older versions. This could be done by determining if any one commit is an ancestor/descendant of another and evicting ancestors from the dependencies.

Sometimes we might want to have multiple versions of the same source tree as dependencies for some reasons. Any eviction should be overridable.