Differences

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

--- projects:projects [2024/10/10 22:41] – jhagstrand
+++ projects:projects [2025/11/16 02:30] (current) – jhagstrand
@@ Line 56: / Line 56: @@
 =====Developer Guidelines=====
-=====.gitignore=====
+====.gitignore====
   robots.txt
@@ Line 129: / Line 129: @@
 Note that use the ssh protocol; never the local protocol.
-====git Workflow====
+==== voyc git Workflow====
-=== Develop in webapps or webdev===
+== refresh the local repo and worktree ==
+  git clone ssh://voyccom@az1-ss8.a2hosting.com:7822/home/voyccom/voycgit/vote.git
-== recreate or refresh the worktree==
-  git clone ssh://voyccom@az1-ss8.a2hosting.com:7822/home/voyccom/voycgit/jslib.git
-    or
-  git clone /home/voyccom/voycgit/jslib.git
-    or
   git branch   # make sure you're in the master branch
   git pull origin master
   git submodule foreach git pull origin master
-== create a feature branch, do your work, commit==
+== start development ==
-  git branch newfeature
+  git branch popup         # create a feature branch
-  git checkout newfeature
+  git checkout popup
+== development ==
   <make changes>
   git status
-  git add *
+  git add .
-  git commit -m 'New feature'
+  git commit -m 'New popup architecture'   # version control
+  git push origin popup      # remote backup
-== merge to master, delete feature branch==
+== pull in simultaneous development from server - ???? ==
+  git switch master
+  git pull origin master
+  git checkout popup
+  git rebase master               # merge modified master into popup branch, resolve conflicts here
+== complete development ==
   git checkout master
-  git merge newfeature
+  git merge popup
-  git diff master..newfeature
+  git diff master..popup
-  git branch -d newfeature
+  git branch -d popup
+  git push origin master      # push to central
+  git push origin -d popup   # delete branch from central
-== push finished master branch up to voycgit ==
+== in webprod ==
-  git push origin master
-=== Publish in webprod ===
   git pull origin master
   git push gitlab master