diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-21 20:14:34 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-21 20:14:34 +0200 |
| commit | 0e5a9e753e30be4aff2e6b4df00d402c49ba4507 (patch) | |
| tree | 1d7c00e87088b123ad36608ebd4d6d27d1dbdc42 | |
| parent | 8c7b95b021bd6f4509a03ac22240788f85c0e4b0 (diff) | |
Merge failures into non-master branches are ok (conflicts)
| -rwxr-xr-x | git/merge.sh | 9 |
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 |