Please enable JavaScript.

Coggle requires JavaScript to display documents.

Master, Versioning: Major.Minor.Hotfix - Coggle Diagram

- - - - Sprint Branch v1.1
        
        SSTARCH-123
        
        commit on task branch
        
        Pull Request (squash and merge)
        
        SSTARCH-123
        
        merge in to feature branch prior to pull request
        
        SSTARCH-150
        
        commit on task branch
        
        Merge commit
        
        Commit on task branch
        
        Pull request (squash and merge)
        
        4 more items...
      - v1.0.1
        
        SSTARCH-123
        
        SSTARCH-150
        
        v1.1
        
        Sprint Branch v1.2
        
        Note v1.1 tagged commit is the sprint's merge commit. The HEAD commit of master should always be "demo ready" along with other versioned commits
        
        Lines up directly with JIRA task, comes into master along with sprint, is not guaranteed to work as a minor release, development commit.
        
        Merging hotfix into active dev (sprint) branch is case-by-case
      - Release Branch - preserve 1.0
        
        Hotfix Branch v1.0.1
        
        commit on hotfix branch
        
        commit on hotfix branch
        
        Merge to release branch (squash and merge)
        
        v1.0.1
        
        Merge to master (optional, case be case)
- - - - Intended to be deployed to customer between releases
      - How it is merged into active dev is case by case