From 584559c686c2031d587fe79df884c2f4b7a5828b Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 3 May 2012 23:54:43 +0100 Subject: [PATCH] merge order --- scripts/mergeAll.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 302de61a0..aba8af34f 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -6,12 +6,15 @@ git merge master git checkout ice-cream-sandwich git merge master -git checkout beta +git checkout multidirs git merge master +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 booksdb git merge master @@ -23,7 +26,4 @@ git merge booksdb git checkout library-service-ics git merge booksdb-ics -git checkout multidirs -git merge master - git checkout master