Managing conflicts regarding an Azure DevOps Repos for Data Factory

Question

Hi,

I'm working together with other colleagues to a Data Factory instance linked to an Azure DevOps Repos.

In a such team working scenario sometimes it occurs a conflict about a pull request to merge a dev branch to main branch, conflict that could be solved simply forcing a branch B against a branch A, both regarding a same ADF object, without any editing or deleting actions in the branch B.

Does it exist a reliable procedure to follow in order to forcing a branch respect to another one in case of a conflict? Thanks

Answer 1

Hey there pmscorca

Thats a good question and thanks for using the QandA platform

i get it whenissue arise in our team's Data Factory instance linked to Azure DevOps Repos, it's important to have a good procedure in place. lemme try giving you a pointers,

First, review the changes in both branches and discuss them with ur team to ensure everyone's on the same page. If the changes can be merged without modification, go ahead and force the merge using version control tools like git push --force or through Azure DevOps interface options.

Try to document the changes and test thoroughly afterward to catch any unexpected issues.

If this helps kindly accept the answer thanks much.,