Merge conflict issue while deploying to Test & Prod

microsoft / coe-starter-kit

Other

751 stars 223 forks source link

Merge conflict issue while deploying to Test & Prod #8649

Open iamaninda93 opened 3 months ago

iamaninda93 commented 3 months ago

What is your question?

We are using a single Dev environment and multiple developers are using that same dev environment for developing the app.Sometime we face merge conflict issue. I have given an image. afbeelding (1)

What component are you experiencing the issue with?

ALM Accelerator Pipelines

What solution version are you using?

Accelerator Version: 1.0.20240305.1(Managed)

AB#3829

MaheshSripada commented 3 months ago

Hi @iamaninda93,

If you are using the same dev environment, when approving/creating the pull request, choose the only the required changes to merge with the main branch from the Azure Devops Pull request tab to avoid merge conflicts.

cc - @RajeevPentyala