fixing merge conflicts.

Author: lizcross

javascript/README.md

@@ -446,4 +446,62 @@ UIService.prototype.addEventing = function(eventEmitter) {
         });
     }.bind(this));
 };
+
+##Method and promise chains
+
+With method-chaining or promise APIs, we may have a long chain of
+method calls in a single statement. It is important to format these so
+that they are readable and flow as clearly as possible.
+
+###Place each call on its own line, beginning with the period, and indented
+
+The sequence of operations is clearer if each 'step' in the process
+begins at the start of the line. Indenting relative to the previous
+line makes the chain distinct.
+
+```javascript
+// Good
+return functionThatReturnsAPromise()
+    .then(preprocessTheResult)
+    .catch(handleErrors)
+    .then(logSomething);
+
+// Bad
+return functionThatReturnsAPromise.then(preprocessTheResult)
+    .catch(handleErrors).then(logSomething);
+```
+
+###Avoid multiple function expressions in a single function call
+
+The break between two function expressions passed as arguments can be
+quite awkward. It is clearer to use named functions, or to change your
+use of the API to split them up.
+
+```javascript
+// Bad
+functionThatReturnsAPromise()
+    .then(function() {
+        // code here!
+    }, function() {
+        // other code here!
+    });
+
+// Good
+var resolveFunction = function() {
+    // code here!
+};
+var rejectFunction = function() {
+    // other code here!
+};
+
+functionThatReturnsAPromise().then(resolveFunction, rejectFunction);
+
+// Also Good
+functionThatReturnsAPromise()
+    .then(function() {
+        // code here!
+    })
+    .catch(function() {
+        // other code here!
+    });
 ```