From 0e5a9e753e30be4aff2e6b4df00d402c49ba4507 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 21 Oct 2011 20:14:34 +0200 Subject: Merge failures into non-master branches are ok (conflicts) --- git/merge.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'git') 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 -- cgit v1.1