--- a/README.txt	Tue May 01 16:21:36 2012 -0700
+++ b/README.txt	Tue May 01 21:09:23 2012 -0400
@@ -35,6 +35,9 @@
 cd rdf
 hg push
 
+# (If you get the error "did you forget to merge? use push -f to force"
+# then you'll need to do a merge.  DO NOT use push -f.)
+
 # To receive changes made by others into your local repository:
 cd rdf
 hg pull