resolve merge conflicts data factory in dev ops

Question

Hi All,
I have a Data Factory V2 which i have connected to Azure DevOps git. I inadvertently edited the master branch then went back to my feature branch to do some more development. When I go to create a pull request to go into master I get a merge conflict. I can see notes about how to resolve this with Visual Studio and Team Explorer where you can select the code you want to keep and then merge or accept the changes but can't see how to do this in Azure Dev Ops for the Data factory.

thanks

Answer 1

Hi *anonymous user*,

Welcome to the Microsoft Q&A platform.

The preferred method for ADF CI/CD deployment is using ADF_Publish branch once changes are published. While merging to master, if there is a merge conflict in the pull request, the merge issues related to json templates can be resolved from Visual Studio as in this url. Below is snap showing the same.

Hope this helps. Do let us know if you have any further queries.