README.markdown in octopolo-1.2.1 vs README.markdown in octopolo-1.3.0

@@ -45,9 +45,13 @@
 From within a bugfix branch, merge the latest released code (or, optionally,
 another named branch) into your current branch.
 
     sync-branch
     sync-branch some-other-branch
+#### Automatic Merge Conflict Resolution
+
+Optionally you can add the line `merge_resolver: <path/to/script>` to the `.octopolo.yml` to
+have Octopolo try to resolve conflicts automatically via a script upon merge failure.
 
 #### Review Changes In Releases
 
 Select from recent release tags and generate a link to the GitHub compare view.