Appsembler Wiki 1.0
  • Site
      • Setting up Flower monitoring on OpenShift
      • Deploy procedure for Mediathread
      • Adding New Relic monitoring to OpenShift
      • Setting up a periodic PostgreSQL DB dump
      • How to add Redis to your OpenShift app
      • Handling secret settings in Django
      • How to set up Sentry on OpenShift
      • Saving and restoring applications on OpenShift
      • SSL for Django apps on OpenShift
      • Serving Django static assets on from OpenShift
      • Git-related Conventions for appsembler-mediathread
  • Page
      • Git-related Conventions for appsembler-mediathread
        • Branch Naming
        • Git flow
          • Installation
          • Configuration
          • Commands
          • Setup
  • « Serving Django s...

Git-related Conventions for appsembler-mediathread¶

Branch Naming¶

The branch should be named as <trello-card-#>-<branch-name>.

e.g. 15-new-form, 57-landing-page

Git flow¶

refer to A successful Git branching model.

Installation¶

Using your Package Manager to install package which is called git-flow.

Linux
sudo apt-get install git-flow
Mac OS X
brew install git-flow

Configuration¶

  • branches
    • production branch: appsembler_master
    • “next release” branch: appsembler_develop
  • prefix
    • feature: feature/ (Default)
    • release: release/ (Default)
    • hotfix: hotfix/ (Default)
    • support: support/ (Default)
    • version tag: None (Default)

Commands¶

initialization
git flow init and answer the prompt by the order of following configuration
start a flow
git flow <prefix> start <branch name> this will create a new branch and checkout it
finish a flow
git flow <prefix> finish <branch name> this will commit your change in that branch and merge it back to “the next release” branch

Setup¶

For the first time you need to run git flow init to initialize git-flow for specified repo, or you can direct modify git config file.

[gitflow "branch"]
    master = appsembler_master
    develop = appsembler_develop
[gitflow "prefix"]
    feature = feature/
    release = release/
    hotfix = hotfix/
    support = support/
    versiontag =

You can also copy and paste above text into your path/to/mediathread/.git/config (replace original one or append in the bottom)

Back to top

© Copyright 2013, Colin Su, Filip Jukić, Nate Aune.




Brought to you by Read the Docs
  • latest