1 files changed, 8 insertions, 1 deletions
diff --git a/git/merge.sh b/git/merge.sh
index 34da466..898a0c0 100755
--- a/git/merge.sh
+++ b/git/merge.sh
@@ -28,8 +28,15 @@ for i in $modules; do
   fi
 
   if [ $? -ne 0 ]; then
+    echo                1>&2
     echo "merge FAILED" 1>&2
-    exit 1
+    echo                1>&2
+
+    # Merge failures (conflicts) into non-master branches are ok.
+    #
+    if [ "$br" = "master" ]; then
+      exit 1
+    fi
   fi
 
   cd $wd