Differences

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

--- media-frontend [2018/09/11 09:15] – derpeter
+++ media-frontend [2026/07/26 21:08] (current) – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
-= media.ccc.de frontend
+# media.ccc.de frontend
-== update from git
+## update from git
-The frontend is generated by nanoc. To increase visibility the project is hosted on github:
+The frontend is generated by nanoc. To increase visibility the project
+is hosted on github:
-https://github.com/voc/media-frontend
+<https://github.com/voc/media-frontend>
 However the deployment uses a seperate git server on koeln.media.ccc.de
@@ Line 11: / Line 12: @@
 ''gitolite@koeln.media.ccc.de:media-frontend''
-Setup local working repository:
+Setup local working repository: - git remote set origin
-  - git remote set origin git@github.com:voc/media-frontend.git
+git@github.com:voc/media-frontend.git - git remote add live
-  - git remote add live gitolite@koeln.media.ccc.de:media-frontend
+gitolite@koeln.media.ccc.de:media-frontend - git co master - git reset
-  - git co master
+--hard origin/master \# (dangerous)
-  - git reset --hard origin/master  # (dangerous)
+Usual workflow: - git co master - git pull origin \# resolve conflicts -
+git push live \# if this fails big problem - git co
+deployment-media.ccc.de - git rebase master - git push -f live
-Usual workflow:
+Never push the deployment-media.ccc.de branch to github, as it contains
-  - git co master
+database passwords and such.
-  - git pull origin  # resolve conflicts
-  - git push live    # if this fails big problem
-  - git co deployment-media.ccc.de
-  - git rebase master
-  - git push -f live
-Never push the deployment-media.ccc.de branch to github, as it contains database passwords and such.