Scribd Logo
Upload

Welcome to Scribd!

  • 12 views

    Code Branching & Merging

    Uploaded by

    Lalit Khanna
    This document discusses code branching and merging workflows. It shows a master branch with release and hotfix branches extending from it. Feature branches extend from the release branch. The document outlines workflows for planned releases and features including creating release and feature branches, merging completed features into the release branch for QA testing, and finally merging the release branch back into master once features are complete. It also provides a high-level overview of the process for raising tickets, assigning work, creating branches, developing code, QA testing, and releasing fixes and features to staging and production environments.

    Copyright:

    © All Rights Reserved
    Download as PPTX, PDF, TXT or read online from Scribd
    Flag for inappropriate content

    You might also like

    Code Branching & Merging

    Uploaded by

    Lalit Khanna
    12 views5 pages
    This document discusses code branching and merging workflows. It shows a master branch with release and hotfix branches extending from it. Feature branches extend from the release branch. The document outlines workflows for planned releases and features including creating release and feature branches, merging completed features into the release branch for QA testing, and finally merging the release branch back into master once features are complete. It also provides a high-level overview of the process for raising tickets, assigning work, creating branches, developing code, QA testing, and releasing fixes and features to staging and production environments.

    Original Description:

    Code Branching & Merging

    Copyright

    © © All Rights Reserved

    Available Formats

    PPTX, PDF, TXT or read online from Scribd

    Did you find this document useful?

    Is this content inappropriate?

    Report this Document
    This document discusses code branching and merging workflows. It shows a master branch with release and hotfix branches extending from it. Feature branches extend from the release branch. The document outlines workflows for planned releases and features including creating release and feature branches, merging completed features into the release branch for QA testing, and finally merging the release branch back into master once features are complete. It also provides a high-level overview of the process for raising tickets, assigning work, creating branches, developing code, QA testing, and releasing fixes and features to staging and production environments.

    Copyright:

    © All Rights Reserved
    Download as PPTX, PDF, TXT or read online from Scribd
    Flag for inappropriate content
    Download as pptx, pdf, or txt
    12 views5 pages

    Code Branching & Merging

    Uploaded by

    Lalit Khanna
    This document discusses code branching and merging workflows. It shows a master branch with release and hotfix branches extending from it. Feature branches extend from the release branch. The document outlines workflows for planned releases and features including creating release and feature branches, merging completed features into the release branch for QA testing, and finally merging the release branch back into master once features are complete. It also provides a high-level overview of the process for raising tickets, assigning work, creating branches, developing code, QA testing, and releasing fixes and features to staging and production environments.

    Copyright:

    © All Rights Reserved
    Download as PPTX, PDF, TXT or read online from Scribd
    Flag for inappropriate content
    Download as pptx, pdf, or txt
    of 5

    CODE

    BRANCHING
    & MERGING

    LALIT KHANNA
    BRANCHING IN ACTION

    Master Branch

    Release Branch Hot Fix Branch

    Feature Branch

     Release – Divided into Features


    MERGE OFFSHORE BRANCH TO ONSHORE BRANCH

    Fork

     PPulP

    Pull Request

    This solution has been implemented from 26-May


    MERGING IN ACTION

     Planned Release

     Planned Feature

     Create release Branch

     Create Feature Branch

     After completion of Every sprint(Feature completion), merge the feature branch with Release branch

     Deploy this branch on QA- QA will test.

     Whatever issues raised from QA, Dev will fix in existing feature branch & deliver end of sprint.

     Once all feature completed , Merge the Release branch to Master.

     QA will test on Master branch


    HIGH LEVEL

    Once product team identify Once this ticket assign to Onshore Team will create a new Once Development & unit QA will validate the respective
    some feature or urgent fix then respective member she/he will branch for this feature/Fix & testing will complete(Code changes.
    raise Jira Ticket. Project team create HLD, there it will show notify Offshore team. checked-in) then onshore team Any Issue will notify to Onsite
    will plan Dev, QA ,UAT, major changes in code. This will Please note if this is urgent fix will notify to offshore team so team
    Production. help to resolve all code conflicts then onshore team spin a Hot they can merge(Fork) this
    in case offshore team is also Fix branch. branch to Release branch.
    working on same module.

    Planning Feature/Fix High Level Document Create a branch Development Completion QA

    Onshore team will fix the QA Validation Stagging Validation, All Production Validation, Release Notes will be publish.
    issue & notify offshore team. issues will notify to Onshore
    team & again same procedure
    will follow.

    Fix Bug QA Stagging Production Release Notes

    You might also like