• We'll not use hotfix branches
• We'll use the term development branch instead of integration branch
  
  

VCS (git)

Development branch

• Will have a proper hudson job
• Will have a proper pom-version (e.g.. x.y.z-DEV-SNAPSHOT)
• Rule: revert immediately as soon as it fails

Master

• Scrum masters merge at the end of the sprint (develop -> master)
• BEWARE to not merge back the "DEV" in the pom version!

Feature branches

• not on central repo? ( ? - see open issues)
• remove them after the final merge
• list of feature branches branches 
  
  • --> things we are actively working on or are waiting
• how to remove the branches?

Build (maven)

• Develop branch needs dedicated pom-version
  
  • Master: x.y.z-SNAPSHOT
  • Develop: x.y.z-DEV-SNAPSHOT
• BEWARE when merging Develop -> Master
  do not merge back the "DEV" in the version

Maintenance

• no changes
• no hot fix branches (for the moment)

Open Issues