Differences

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

--- git_slides [2014/10/21 10:40] – admin
+++ git_slides [2014/10/21 12:01] (current) – admin
@@ Line 21: / Line 21: @@
 ===== Spezialfall "rebase" =====
-http://www.effectivetrainings.de/blog/wp-content/uploads/2013/10/rebase_use_case.png
+{{http://www.effectivetrainings.de/blog/wp-content/uploads/2013/10/rebase_use_case.png?600|rebase}}
 ===== Was sind die Vorraussetzungen? =====
@@ Line 37: / Line 37: @@
     * Deployment TEST
     * Deployment LIVE, wenn TEST ok
+===== Der Jochen zeigt ... =====
+  - Ablauf anhand von Magento (TEST) - mage.local <=> mage-test.tagwork-one.de
+  - Einrichtung anhand von Magento (LIVE)
+  - GIT:
+    - Stash - Änderung "zurückstellen"
+    - Stage -> commit -> push
+    - Branch "erstellen" und wieder "mergen"
+===== Links =====
+  * GIT Docs: http://git-scm.com/docs
+  * Cheatsheet / Commands:
+      * Neumodisch: http://ndpsoftware.com/git-cheatsheet.html
+      * Oldschool: https://training.github.com/kit/downloads/github-git-cheat-sheet.pdf
+  * Merge vs. Rebase: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/
+  * Rebase Details: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/