Make release process get the tag from maint into master

2010-07-21 05:53:45 +02:00 · 2010-07-21 05:53:45 +02:00 · c3740a936b
parent 1f6a1c0cba
commit c3740a936b
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -297,6 +297,7 @@ release:
 	make pushreleasetag TAG=$(TAG)
 	git push origin maint
 	git checkout master
+	git merge -s ours maint
 	UTILITIES/set-version.pl -o $(TAG)
 	git commit -a -m "Update website to show $(TAG) as current release"
 	git push