This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionLast revisionBoth sides next revision | ||
git_slides [2014/10/21 10:41] – [Spezialfall rebase] admin | git_slides [2014/10/21 11:43] – [Der Jochen zeigt ...] admin | ||
---|---|---|---|
Line 38: | Line 38: | ||
* Deployment LIVE, wenn TEST ok | * 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 " | ||
+ | - Stage -> commit -> push | ||
+ | - Branch " | ||
+ | |||
+ | ===== Links ===== | ||
+ | |||
+ | * Cheatsheet / Commands: | ||
+ | * Neumodisch: http:// | ||
+ | * Oldschool: https:// | ||
+ | * Merge vs. Rebase: http:// | ||
+ | * Rebase Details: http:// |