Home

Welcome to the poppyGP-player wiki!

Git Workflow

(I messed up, so this is here for my own purposes as well as anybody who wishes to contribute)

         v0.1.0  v0.2.0            v1.0.0
  master ═══╪═══╤═══╪═════════════════╪══════
    hotfix  │   └─┬─┘                 │
            │     │                   │
    release │     │  ╒═══╤═══╕       ╒╧═╕
            │     │  │   │   │       │  │
    develop ╘═╤═╤═╧═╤╧═══╧═══╪═══╤╤══╧══╧════
              │ │   │        │   ││
  feature/xxx │ └───┘        └───┘│
  feature/yyy └───────────────────┘

• Explanation
• Original Source

Primary Branches

• master - main stable release branch; semver tagged
• develop - main development branch

Secondary Branches

• feature - branch from develop & merge into develop
  • Create feature/xxx branch for specific feature development
  • Merge stable feature back into develop for next release
• release - branch from develop & merge into master or develop
  • Create release/xxx branch when nearing feature-completion
  • Prepare next release, correct eventual bugs, continue development in parallel
  • Merge stable release back into master, and also into develop to update
• hotfix - branch from master & merge into master or develop/release
  • Create hotfix/xxx from master when resolving critical bugs in production (e.g. unplanned)
  • Merge back into master with according version number
  • Merge back into develop or release accordingly to update

...however confusing that diagram made things