summaryrefslogtreecommitdiff
path: root/contributing/web_pages/news/merge-news
blob: 33c01b7bc585cff400ace85979926dd68b3c104c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
#!/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