1 / 7

GIT for Magento

GIT for Magento. A tutorial about GIT with some note for Magento. Outline. Magento Structure GIT workflow Naming rules for GIT + Magento Discussion. Magento Structure. Module Structure Controller Block Layout SQL setup. GIT workflow. Message format 50 for head 72 for remaining

abrial
Download Presentation

GIT for Magento

An Image/Link below is provided (as is) to download presentation Download Policy: Content on the Website is provided to you AS IS for your information and personal use and may not be sold / licensed / shared on other websites without getting consent from its author. Content is provided to you AS IS for your information and personal use only. Download presentation by click this link. While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server. During download, if you can't get a presentation, the file might be deleted by the publisher.

E N D

Presentation Transcript

  1. GIT for Magento A tutorial about GIT with some note for Magento

  2. Outline • Magento Structure • GIT workflow • Naming rules for GIT + Magento • Discussion

  3. Magento Structure • Module Structure • Controller • Block • Layout • SQL setup

  4. GIT workflow • Message format • 50 for head • 72 for remaining • What if longer? • GIT branching • Merge • Conflict + Resolve • GIT ignore

  5. GIT Rules • Merge from origin/develop at the start of the work day • Commit your edits to your local repository at the end of the day • Never copy/rename (Eg. creating a .bak file) a file to create a restore point for temporary edits • Live/production site pulls must be authorised by the relevant party only after the staging release has been approved

  6. GIT + Magento • Always give descriptive commit comments with ticket number/bug ID references where necessary • When you are finished with a branch, delete the branch, its files, its database and associated users • Never push to the remote repository master , develop

  7. GIT + Magento • Naming branches • feature/namespace/module • feature/namespace/module/part • hotfix/namespace/module/<ticket no>-problem • Commit • <Folder>_<path> Message + Body

More Related