Skip to content

Instantly share code, notes, and snippets.

@kolunar
Created April 24, 2017 23:00
Show Gist options
  • Save kolunar/919fdd8460ef53b6eb3bbbed5db08794 to your computer and use it in GitHub Desktop.
Save kolunar/919fdd8460ef53b6eb3bbbed5db08794 to your computer and use it in GitHub Desktop.
Procedures for publishing the source code to live production site online
+--------------------+
| Feature |
+--------------------+
Start a new feature
|- Development of new features starting from the 'develop' branch.
Finish up a feature
|- Finish the development of a feature.
|- Merges the feature branch into 'develop'
|- Removes the feature branch
|- Switches to 'master' branch
|- Merges 'develop' into 'master'
Online publish
|- Switches to 'master' branch
|- get latest code from master
|- replace file into online
+----------------+
| Release |
+----------------+
Start a new release
|- Development of new release starting from the 'develop' branch.
Finish up a release
|- Finish the development of a release.
|- Merges the release branch back into 'master'
|- Back-merges the release into 'develop'
|- Removes the release branch
Online publish
|- Switches to 'master' branch
|- get latest code from master
|- replace file into online
+----------------+
| Hotfixes |
+----------------+
Start a new hotfixes
|- Development of new hotfixes starting from the 'master' branch.
Finish up a hotfixes
|- Finish the hotfixes.
|- Merges the hotfixes branch back into 'master'
|- Back-merges the hotfixes into 'develop'
|- Removes the hotfixes branch
Online publish
|- Switches to 'master' branch
|- get latest code from master
|- replace file into online
+------------------+
| Daily check |
+------------------+
|- Switches to 'master' branch
|- Merges 'develop' into 'master'
|- Switches to 'develop' branch
|- Merges 'master' into 'develop'
|- Switches to the current branch ( release / feature )
|- Merges 'develop' into current branch
Ref : http://danielkummer.github.io/git-flow-cheatsheet/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment