summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-06-04 23:59:28 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-06-04 23:59:28 -0500
commit8f4c288343b02d053a396ac3aa4bec0f2b85655c (patch)
treef46d06d321f85835d316149d2175141ce122b1eb
parent841213e3d3447633b5fed3b3d0fb9d3d1f903bde (diff)
downloadbundler-seg-gemspec-allow-conflicts.tar.gz
[Docs] Document gempsec conflict behaviorseg-gemspec-allow-conflicts
-rw-r--r--man/gemfile.5.ronn4
1 files changed, 4 insertions, 0 deletions
diff --git a/man/gemfile.5.ronn b/man/gemfile.5.ronn
index b707e2a5c5..5b39268657 100644
--- a/man/gemfile.5.ronn
+++ b/man/gemfile.5.ronn
@@ -480,6 +480,10 @@ options, which control where bundler looks for the `.gemspec`, the glob it uses
for the gemspec (defaults to: "{,*,*/*}.gemspec"), what named `.gemspec` it uses
(if more than one is present), and which group development dependencies are included in.
+When a `gemspec` dependency encounters version conflicts during resolution, the
+local version under development will always be selected -- even if there are
+remote versions that better match other requirements for the `gemspec` gem.
+
## SOURCE PRIORITY
When attempting to locate a gem to satisfy a gem requirement,