class Bundler::Resolver

def resolve_conflict(current, states)
  # Find the state where the conflict has occurred
  state = find_conflict_state(current, states)
  debug { "    -> Going to: #{current.name} state" } if current
  # Resolve the conflicts by rewinding the state
  # when the conflicted gem was activated
  reqs, activated, depth, conflicts = resolve_for_conflict(state)
  # Keep the state around if it still has other possibilities
  states << state unless state.possibles.empty?
  clear_search_cache
  return reqs, activated, depth, conflicts
end