il y a 7 ans · 1d2325f429
--- a/script/merge
+++ b/script/merge
@@ -2,6 +2,7 @@
 
				 
			
 
				 echo "Merging to Production Branch.."
			
 
				 
			
 
				+git checkout production
			
 
				 git merge master
			
 
				 git checkout master
			
 
				 git merge production