Unanswered

ALM on-demand environment for developement and resolving conflict

(0) Share

Report

Posted on by Community Power Pla...

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

Categories:

Application Lifecycle Management (ALM)

All responses (2)

Answers (0)

Phil_Cole 133 on at

Like (1)

Report

Re: ALM on-demand environment for developement and resolving conflict

It's not officially supported to merge solution XML except for the few areas define it in the docs. https://learn.microsoft.com/en-us/dynamics365/customerengagement/on-premises/developer/customize-dev/when-edit-customization-file?view=op-9-1

Generally any changes made in an ad-hoc developer env need to be exported and imported into a 'merge' environment, which is unpacked. Difficulties occur if deletions have been made in a Dev env, because these have to be re-delete in the merge env. Similarly overlapping changes to a component (e.g. form) will mean that the 'last' one wins.

Good communication is a must.

Interested to see how the Co-authoring recently announced by Microsoft will affect this area
hazer_kirbasogl 9 on at

Like (0)

Report

Re: ALM on-demand environment for developement and resolving conflict

Did you handle it, I have almost same questions about these..