cancel
Showing results for 
Search instead for 
Did you mean: 
Reply
DynamicDaveCap
New Member

ALM on-demand environment for developement and resolving conflict

Hello, 

 

Been looking into isolated developer environments (story) for Power platform development, mainly dataverse or products based on this for now. 

 

happy path, create a story branch and use the build tasks to create an env and deploy our solutions unmanaged. when development completes export and unpack to the branch and raise a pr (include automated testing ect) before merging into master. 

However realistically, developers working on isolated envs in parallel, there is going to be conflict at the component level such as forms/workflows ect.  for some we can minimize the occurrence by good communication, making components small ect 

 

 

some questions:

  • Are we allowed to use source control to merge the XML files?  
  • in the case of conflict are we allowed to pick either the story or main file/line in source control?
  • do you have any guidance/options on how should resolve conflicts in an efficient and supported way (automating where possible)?
    • for example;
      • using a temp story solution for non-conflicting added/updated components in the dev environment, deploying to a conflict resolution env (based on latest from master) then resolving the conflicts here before exporting and extracting back to the dev branch and taking the changes from dev branch 
      • custom merge drivers/ conflict pr build validation which could detect and automate some of the above

 

 

 

 

 

 

0 REPLIES 0

Helpful resources

Announcements
UG GA Amplification 768x460.png

Launching new user group features

Learn how to create your own user groups today!

Community Connections 768x460.jpg

Community & How To Videos

Check out the new Power Platform Community Connections gallery!

M365 768x460.jpg

Microsoft 365 Collaboration Conference | December 7–9, 2021

Join us, in-person, December 7–9 in Las Vegas, for the largest gathering of the Microsoft community in the world.

Users online (1,837)