knallimall.org knallimall.org

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 revisionPrevious revision
Next revision		Previous revision
git_slides [2014/10/21 12:57] – [Links] admingit_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 =====
  
 +  * GIT Docs: http://git-scm.com/docs
   * Cheatsheet / Commands:    * Cheatsheet / Commands: 
       * Neumodisch: http://ndpsoftware.com/git-cheatsheet.html       * Neumodisch: http://ndpsoftware.com/git-cheatsheet.html
Line 45: Line 55:
   * Merge vs. Rebase: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/   * 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/   * Rebase Details: http://www.effectivetrainings.de/blog/2013/10/20/simple-git-merge-und-rebase-verstandlich/
 +
git_slides.txt · Last modified: 2014/10/21 14:01 by admin

Page Tools