Merge branch 'master' of github.com:GoogleCloudPlatform/java-repo-tools into update-java-repo-tools

tswast · tswast · commit 08cbe5e26ed9 · 2016-03-30T17:03:06.000-07:00
diff --git a/java-repo-tools/README.md b/java-repo-tools/README.md
@@ -41,6 +41,19 @@ git checkout master
 # Making a new branch ia optional, but recommended to send a pull request to
 # start using java-repo-tools.
 git checkout -b use-java-repo-tools
+```
+
+So that we can pull future updates from the `java-repo-tools` repository, we
+merge histories. This way we won't get unnecessary conflicts when pulling changes
+in.
+
+```
+git merge -s ours --no-commit java-repo-tools/master
+```
+
+Finally, read the `java-repo-tools` into a subtree.
+
+```
 git read-tree --prefix=java-repo-tools/ -u java-repo-tools
 ```
 
