7 年之前 · 96a5b482b2
--- a/script/merge
+++ b/script/merge
@@ -2,7 +2,7 @@
 
				 
			
 
				 echo "Merging to Production Branch.."
			
 
				 
			
 
				-git checkout production
			
 
				-git merge master
			
 
				 git checkout master
			
 
				+git merge master
			
 
				+git checkout production
			
 
				 git merge production