From c207b09df537655f1e13f519cdf098bab57bc992 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Sun, 20 Jan 2013 05:16:16 +0400 Subject: [PATCH] merge order --- scripts/mergeAll.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index a056a69c2..7403bd4e0 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -13,14 +13,14 @@ git checkout beta git merge multidirs git checkout beta-ics -git merge ice-cream-sandwich git merge beta +git merge ice-cream-sandwich git checkout library-service git merge master git checkout library-service-ics -git merge ice-cream-sandwich git merge library-service +git merge ice-cream-sandwich git checkout master