Merge branch 'stable'

jgubman · Oct 9, 2015 · e58c226 · e58c226
2 parents 7ce59ef + 0832b89
commit e58c226
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/contrib.json b/contrib.json
@@ -148,7 +148,10 @@
       "desc": "Merge a submitted patch",
       "steps": [
         { "include": "update {{meta.branches.release}}" },
-        { "include": "pull_request accept" }
+        { "include": "pull_request accept" },
+        [ "git checkout master",                    "Checkout the developmet branch" ],
+        [ "git merge stable",                       "Merge the patch changes" ],
+        [ "git push upstream master",               "Push the development changes" ]
       ]
     }
   },