Skip to content

Commit

Permalink
Do not merge console branch
Browse files Browse the repository at this point in the history
  • Loading branch information
william0wang committed Jan 13, 2015
1 parent 605d927 commit 549eee2
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions automerge.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ tmpFile="autom.sh"

echo "git checkout official" >> $tmpFile
echo "git pull official master" >> $tmpFile
echo "git checkout console" >> $tmpFile
echo "git merge official" >> $tmpFile
echo "git checkout master" >> $tmpFile
echo "git merge official" >> $tmpFile
echo "rm -f "$tmpFile >> $tmpFile
Expand Down

0 comments on commit 549eee2

Please sign in to comment.