Git Workflow

Here's the workflow I'll use in my repo, a slight variation of the one describe in the following article : http://nvie.com/posts/a-successful-git-branching-model/

Shameless plug of the original workflow chart :

Granted, it's a bit of an old one, but it's still very sound.

• "master" branch

  • long-lived, same use
  • will always reflect the official Ortho4XP releases
  • the tags are the official Ortho4XP releases from Oscar.

• "develop" branch

  • long-lived, same use
  • will be called "integration" in my repo

• "feature" branches

  • short-lived, same use
  • will be called "dev/my_awesome_feature" in my repo
  • when a feature is mature enough, I send it as a proposal to Oscar
  • if he's ok, can be delivered to the integration branch

• "release" branches

  • short-lived, same use
  • in the "only bugfixes" bullet, I will also merge in Oscar's latest changes, if any, and do some final tests
  • then I send it to Oscar so that the changes can make it in the next version
  • there's no "green to blue" arrow : I'll only update master with Oscar's versions

• "hotfixes" branches

  • short-lived, same use
  • there's no "red to blue" arrow : that arrow will go instead in an intermediate branch, "master-fixes"
  • still delivered to the integration (red to yellow arrow)

• "master-fixes" branch

  • short-lived
  • based on a particular master tag
  • between hotfixes and master in the schema
  • will receive all the hotfixes in place of master