Include detailed dependencies when gemfile and lockfile are conflicts#9332

hsbt wants to merge 3 commits intomasterruby/rubygems:masterfrom

show-incorrect-dependencies-messageruby/rubygems:show-incorrect-dependencies-messageCopy head branch name to clipboard