User Tools

Site Tools


git_slides

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
git_slides [2014/10/21 12:56]
admin [Links]
git_slides [2014/10/21 14:01] (current)
admin
Line 37: Line 37:
     * Deployment TEST     * Deployment TEST
     * 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 "zurückstellen"
 +    - Stage -> commit -> push
 +    - Branch "erstellen" und wieder "mergen"
  
 ===== Links ===== ===== Links =====
  
-* Cheatsheet / Commands: http://ndpsoftware.com/git-cheatsheet.html +  * GIT Docs: http://git-scm.com/docs 
-* Merge vs. Rebase: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/ +  * Cheatsheet / Commands:  
-* Rebase Details: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/+      * 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/ 
git_slides.1413888961.txt.gz · Last modified: 2014/10/21 12:56 by admin