diff --git a/scripts/mergeAll.sh b/scripts/mergeAll.sh index 56c83ade5..29a88e707 100755 --- a/scripts/mergeAll.sh +++ b/scripts/mergeAll.sh @@ -10,4 +10,13 @@ git checkout beta-ics git merge beta git merge ice-cream-sandwich +git checkout catalogs-ics +git merge ice-cream-sandwich + +git checkout catalogs-ics-reorder +git merge catalogs-ics + +git checkout postion-2 +git merge master + git checkout master