Merge branch 'develop'

untangled-web · Nov 7, 2016 · 199a4a8 · 199a4a8
2 parents a0d4a93 + bb74b73
commit 199a4a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ You should now be able to run the builds via the IDE.
 ### Command line
 
 ```
-JVM_OPTS="-Ddevguide" lein run -m clojure.main script/figwheel.clj
+JVM_OPTS="-Ddevguide -Dtest" lein run -m clojure.main script/figwheel.clj
 ```
 
 ## Accessing the Guide and the Tests:

diff --git a/docs/figwheel-build.png b/docs/figwheel-build.png
diff --git a/src/devguide/untangled_devguide/M30_Advanced_Mutation.cljs b/src/devguide/untangled_devguide/M30_Advanced_Mutation.cljs
@@ -55,7 +55,10 @@
   IMPORTANT: The general interaction with the world requires integration of external data (often in a tree format) with
   your app database (normalized graph of maps/vectors). As a result, you almost always want an Om-managed query when
   integrating data, so that the result is normalized. This is also why mutations don't have return values: there is
-  no query to use to merge such a result.
+  no query to use to merge such a result (in stock Om Next you 
+  could override merge to try to address this, but we feel that 
+  creates a concentration of cross-cutting concerns in `merge` with 
+  little practical benefit).
 
   ### Creating Components *Just* For Their Queries