---

vam-google · web-flow · commit 64983f853dda · 2017-08-08T11:51:22.000-07:00
yaml --- r: 8227 b: refs/heads/master c: 7a83404 h: refs/heads/master i: 8225: 71b3df6 8223: cc35eec
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 94f395ecb7e79a6536a320a15f81d343a7826d7e
+refs/heads/master: 7a834042458af7df4f5b09fa4546703adb8ad4b0
 refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
 refs/heads/gh-pages: 0114589947fea527ea3831330789accedbecf45c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/README.md b/trunk/README.md
@@ -68,6 +68,40 @@ libraryDependencies += "com.google.cloud" % "google-cloud" % "0.21.1-alpha"
 
 For running on Google App Engine, see [more instructions here](./APPENGINE.md).
 
+Resolving dependency conflicts
+----------
+Optionally, if you encounter dependency conflicts, you may specify google-cloud-pom as a ["bill of materials"](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies) to ensure that internal dependencies of google-cloud and your project are in sync.
+
+If you are using Maven, add this to your pom.xml file
+```xml
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-pom</artifactId>
+      <version>0.21.1-alpha</version>
+      <type>pom</type>
+      <scope>import</scope>
+    </dependency>
+  </dependencies>
+</dependencyManagement>
+```
+If you are using Gradle, add the following plugin at the beginning of your build.gradle file
+
+```Groovy
+plugins {
+  id "io.spring.dependency-management" version "1.0.3.RELEASE"
+}
+```
+Then add the following in your build.gradle file
+```Groovy
+dependencyManagement {
+  imports {
+    mavenBom 'com.google.cloud:google-cloud-pom:0.21.1-alpha'
+  }
+}
+```    
+
 Example Applications
 --------------------
 
