Differences

This shows you the differences between two versions of the page.

--- wiki:development:release-howto-mswin [2016/09/20 22:25]
mikedep333 ver-YYYYMMDD -> ver-YYYY.MM.DD We've been doing this for a while now.
+++ wiki:development:release-howto-mswin [2016/09/20 22:36]
mikedep333 Steps for build-main-mswin branch
@@ Line 34: / Line 34: @@
 |  3  | <code bash>git commit -am 'release <ver>'</code> | |
 |  4  | <code bash>git push</code> | |
+Update the build-main-mswin branch. If you created a branch earlier:
+^  No  ^  Command  ^  Tips / Comment  ^
+|  1  | <code bash>git branch -f build-main-mswin <release/ver-mswin></code> |
+|  2  | Ask the X2Go git admin to run the same command on the server | Currently, Ionic is the admin |
+If you did not create a branch earlier:
+^  No  ^  Command  ^  Tips / Comment  ^
+|  1  | <code bash>git checkout build-main-mswin </code> | |
+|  2  | <code bash>git merge --ff-only <release/ver-mswin></code> | |
+|  3  | <code bash>git push</code> | |
 Now, if building X2Go Client, perform a build using Jenkins.

X2Go - everywhere@home