summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaoran S. Diao <0@hairydiode.xyz>2019-01-31 14:42:00 -0500
committerHaoran S. Diao <0@hairydiode.xyz>2019-01-31 14:42:00 -0500
commit5c9a1825ebb5f3c32bd855b93fa4eb7d710e0b8d (patch)
tree9f7438bd58548c5ab9ea0927007c6be0a648dd07
parentf636e937d8c761b75ec055fd16665d5d0d3c7f69 (diff)
updated workflow instructions
-rw-r--r--cont/csc-workflow.html4
-rw-r--r--csc-workflow.html4
2 files changed, 8 insertions, 0 deletions
diff --git a/cont/csc-workflow.html b/cont/csc-workflow.html
index e35c4aa..3326f46 100644
--- a/cont/csc-workflow.html
+++ b/cont/csc-workflow.html
@@ -29,6 +29,10 @@ where $branch could be:
backend-devel
controller-devel
+1.5. Set the upstream of your branch to sync to that branch on the git server.
+
+git branch --set-upstream-to origin/$branch
+
2. Make the changes you want to make, and commit them.
type "git branch" to make sure you're on the development branch.
diff --git a/csc-workflow.html b/csc-workflow.html
index 4dfb06d..f7d891a 100644
--- a/csc-workflow.html
+++ b/csc-workflow.html
@@ -45,6 +45,10 @@ where $branch could be:
backend-devel
controller-devel
+1.5. Set the upstream of your branch to sync to that branch on the git server.
+
+git branch --set-upstream-to origin/$branch
+
2. Make the changes you want to make, and commit them.
type "git branch" to make sure you're on the development branch.