From f636e937d8c761b75ec055fd16665d5d0d3c7f69 Mon Sep 17 00:00:00 2001 From: "Haoran S. Diao" <0@hairydiode.xyz> Date: Thu, 24 Jan 2019 16:08:45 -0500 Subject: added push instructions to the workflow page --- cont/csc-workflow.html | 6 ++++++ csc-workflow.html | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/cont/csc-workflow.html b/cont/csc-workflow.html index fee917b..e35c4aa 100644 --- a/cont/csc-workflow.html +++ b/cont/csc-workflow.html @@ -31,6 +31,8 @@ where $branch could be: 2. Make the changes you want to make, and commit them. +type "git branch" to make sure you're on the development branch. + git commit $file where file is the file you have changed, if it is new run @@ -39,6 +41,10 @@ git add $file 3. Afterwards, ask for a code review from me or somebody else. +Push your changes to the remote repository running on ryugyong + +git push + if the code passes review, I will merge it with master. 4. Put the code into production diff --git a/csc-workflow.html b/csc-workflow.html index de67b1b..4dfb06d 100644 --- a/csc-workflow.html +++ b/csc-workflow.html @@ -47,6 +47,8 @@ where $branch could be: 2. Make the changes you want to make, and commit them. +type "git branch" to make sure you're on the development branch. + git commit $file where file is the file you have changed, if it is new run @@ -55,6 +57,10 @@ git add $file 3. Afterwards, ask for a code review from me or somebody else. +Push your changes to the remote repository running on ryugyong + +git push + if the code passes review, I will merge it with master. 4. Put the code into production -- cgit v1.1