summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaoran S. Diao <0@hairydiode.xyz>2019-01-24 16:08:45 -0500
committerHaoran S. Diao <0@hairydiode.xyz>2019-01-24 16:08:45 -0500
commitf636e937d8c761b75ec055fd16665d5d0d3c7f69 (patch)
treeadee5867dcb3cd97f8bc7ecae756d797b872bb01
parenta04191ef133c3205a5beafbf03335ba54ba14ad4 (diff)
added push instructions to the workflow page
-rw-r--r--cont/csc-workflow.html6
-rw-r--r--csc-workflow.html6
2 files changed, 12 insertions, 0 deletions
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