diff options
Diffstat (limited to 'contributing/web_pages/news/merge-news')
| -rw-r--r-- | contributing/web_pages/news/merge-news | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/contributing/web_pages/news/merge-news b/contributing/web_pages/news/merge-news deleted file mode 100644 index 33c01b7b..00000000 --- a/contributing/web_pages/news/merge-news +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# merge into master -git checkout master -git pull --rebase -git merge master-news_next - -# push master -git push origin master - -# switch back to master-news_next -git checkout master-news_next -git pull --rebase |