Differences

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

--- media-frontend [2015/01/11 15:17] – created mm
+++ media-frontend [2026/07/26 21:08] (current) – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
+# media.ccc.de frontend
+## update from git
+The frontend is generated by nanoc. To increase visibility the project
+is hosted on github:
+<https://github.com/voc/media-frontend>
+However the deployment uses a seperate git server on koeln.media.ccc.de
+''gitolite@koeln.media.ccc.de:media-frontend''
+Setup local working repository: - git remote set origin
+git@github.com:voc/media-frontend.git - git remote add live
+gitolite@koeln.media.ccc.de:media-frontend - git co master - 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
+Never push the deployment-media.ccc.de branch to github, as it contains
+database passwords and such.