Multiple Developers + Separate Development Instance Merging same Solution components.

(0) Share

Report

Posted on by Suganthar_Satkunam

210

Hi Community, We do have the 2 Development Environments and 2 separate Developers are working separately on their solution but on same component.

Developer 1 in Environment 1 ( Main Development)

Solution A

Account Entity and it has a changes from Developer 1

Developer 2 in Environment 2 (Temp Environment)

Solution B

Account Entity and it has a changes from Developer 2

What I want to achieve here is to deploy the Export the solution B and import into Main Development Environment (Environment 1) every day around 6 PM using Azure Dev Ops. I have already have the Azure Dev Ops Pipeline to deploy the solution from Main Dev Environment to Other Higher Envoiurnment.

But When I deploy the Solution B to Main Environment ( Environment 1) , it is overwriting the changes made by the Developer 1. What we want is to merge with Developer 1 changes. Is it possible to achieve ?

And what is the recommendation on this type of Development scenarios?

All responses (2)

Answers (0)

Danny Vargas 30 on at

Like (0)

Report

RE: Multiple Developers + Separate Development Instance Merging same Solution components.

Yes, this is correct, there is no way to do it through Azure Dev Ops. So you need to do it manually. Here is a good article with some information about it carldesouza.com/.../ please let us know if it works for you and mark this as resolved.
AM-22040756-1 405 on at

Like (1)

Report

RE: Multiple Developers + Separate Development Instance Merging same Solution components.

Hello,

Development on common component needs to manually merge.

With your current approach it is obvious it will overwrite the changes.