📒
nx-ng-starter
  • Contributor Covenant Code of Conduct
  • Contributing to this repository
  • Nx Ng Starter
  • Security
  • Support
  • Tools
    • diagrams
      • branching
      • pr-validation-pipeline
      • trunk-on-push-pipeline
    • tools/shell
    • tools/ts
      • Unit Coverage Stats
    • generators
      • client-feature
        • <%= name %>
      • client-store
        • <%= name %>
      • client-ui
        • <%= name %>
      • client-util
        • <%= name %>
  • .github
    • ISSUE_TEMPLATE
      • bug_report
    • ISSUE_TEMPLATE
      • feature_request
    • ISSUE_TEMPLATE
      • maintenance
  • Libraries
    • backend-auth
    • backend-diagnostics
    • backend-gql
    • backend-grpc
    • backend-interfaces
    • backend-logger
    • backend-websocket
    • client-chatbot
    • client-core-components
    • client-core
    • Angular D3 Chart Components Module
    • client-diagnostics
    • client-directives
    • client-gql
    • client-grpc
    • client-material
    • client-pwa-offline
    • client-services
    • client-sidebar
    • client-store-chatbot
    • client-store-http-api
    • client-store-http-progress
    • client-store-sidebar
    • client-store-theme
    • client-store-user
    • client-store-websocket
    • client-store
    • client-translate
    • client-unit-testing
    • Angular Eliza Chatbot Module
    • client-util-sentry
    • client-util
    • proto
Powered by GitBook
On this page

Was this helpful?

  1. Tools
  2. diagrams

branching

sequenceDiagram autonumber working branch->>main: Can I merge changes?

loop MERGE CONFLICTS
  main-->>working branch: Merge conflicts.
  working branch-->>main: Merge conflicts resolved.
end
Note right of working branch: Merge conflicts are addressed <br> before premerge check starts.

loop PREMERGE CHECK
  main->>main: Lint, Test (unit), Build.
  main-->>working branch: Premerge check failure.
  working branch-->>main: Premerge failures fixed.
end
Note right of working branch: Premerge checks <br> affected sources.

main->>main: Premerge success: Lint, Test (unit), Build / Deploy main.
Note left of main: On premerge success <br> all sources are checked.

loop RELEASE
  main->>release: Release functionality
  Note left of main: Each release release branch <br> gets overwritten with main.
  release->>release: Lint, Test (E2E, optional), Build / Deploy staging.
  release-->>main: Hotfix required.
  main-->>working branch: Hotfix required.
  working branch-->>working branch: I have a hotfix. Go to step 1.
end
PreviousdiagramsNextpr-validation-pipeline

Last updated 2 years ago

Was this helpful?