web
You’re offline. This is a read only version of the page.
close
Skip to main content

Notifications

Announcements

No record found.

News and Announcements icon
Community site session details

Community site session details

Session Id :
Dynamics 365 Community / Forums / Finance | Project Operations, Human Resources, ... / Reverse integrate - br...
Finance | Project Operations, Human Resources, ...
Suggested Answer

Reverse integrate - branching strategy

(0) ShareShare
ReportReport
Posted on by Yuji 4,131

Hi experts,

In our project, we will have multiple releases/waves.

Now (still in UAT phase for wave1) we have Dev and Main Branch, all the developers will check in their codes to Dev, and once the codes are validated, we merged those changesets from Dev to Main branch. And we will generate the package from main branch and deploy to UAT.

Once the wave 1 goes live, we are thinking to create a new Release1 branch which hold the codes for wave1 production environments. 

At the mean time, we will start the Release2 development. My question is how to manage the codes in different branches?

For example, if there is a code for Release1 hotfix, should we check in the code against Release1 Branch? I am not sure how to "reverse integration" these changesets from Release1 back to Dev branch. Is it just as simple as a "merge" from Release1 to Dev?

Thanks,

I have the same question (0)
  • Suggested answer
    Mohit Rampal Profile Picture
    Mohit Rampal 12,565 Moderator on at

    Hi Yuji, we are doing exactly same.. one phase was Go-Live last year and another development phase started. From our Main branch we created just one more branch for new development phase. In your scenario as well, your current dev branch can act as support branch for for wave1. All changes will be merged to Main branch and wave2 branch can get those changes directly from Main branch.  

  • Yuji Profile Picture
    Yuji 4,131 on at

    Thanks Mohit,

    I am not sure if I understand correctly:

    DEV Branch - Hotfix code check-in to this branch

    Main Branch - Validated hotfix code merged to this branch

    Wave2 branch - wave2 code directly check-in to this branch, and also the validated wave1 hotfix code will merged from Main to wave2?

  • Suggested answer
    Mohit Rampal Profile Picture
    Mohit Rampal 12,565 Moderator on at

    Hi Yuji, Below is our branches Hierarchy, Main-SIT is for releasing to Test environment, out of Main-SIT we created Main-Development which was for the project that went Go-Live last year and now its in support for production. New phase started so created xxxxxDev branch from Main-Development. Hope it helps.

    pastedimage1681196874060v2.png

  • Yuji Profile Picture
    Yuji 4,131 on at

    Thanks Mohit,

    Another question is the changeset check-in flow.

    In your scenario, if there is a code for Main-SIT. Should we check in the code directly in Main-SIT, or should we check in the code in xxxxxDev branch, then merge those codes from xxxxxDev to Main-Development, then Main-SIT?

Under review

Thank you for your reply! To ensure a great experience for everyone, your content is awaiting approval by our Community Managers. Please check back later.

Helpful resources

Quick Links

Responsible AI policies

As AI tools become more common, we’re introducing a Responsible AI Use…

Neeraj Kumar – Community Spotlight

We are honored to recognize Neeraj Kumar as our Community Spotlight honoree for…

Congratulations to the November Top 10 Community Leaders!

These are the community rock stars!

Leaderboard > Finance | Project Operations, Human Resources, AX, GP, SL

#1
Martin Dráb Profile Picture

Martin Dráb 565 Most Valuable Professional

#2
André Arnaud de Calavon Profile Picture

André Arnaud de Cal... 450 Super User 2025 Season 2

#3
Sohaib Cheema Profile Picture

Sohaib Cheema 250 User Group Leader

Last 30 days Overall leaderboard

Featured topics

End-of-life Announcement for Microsoft Dynamics GP

Product updates

Dynamics 365 release plans