How to resolve conflicts in devops

NishimuraChinatsu-9854 756 Reputation points

Although this link service(ls_hana) exists in the current master branch, development was underway on a branch created prior to that branch, which did not have this link service, so an exactly equivalent link service was created in this branch as well. This resulted in a conflict. Is there no other way but to create a new branch? I would like to know how to solve this problem.

Is it possible to create an equivalent in each branch that already exists in the master branch and merge them?
If we need the same thing, please let us know what the best practice is going forward.

Not Monitored
Not Monitored
Tag not monitored by Microsoft.
35,744 questions
0 comments No comments
{count} votes

Accepted answer
  1. Dave Patrick 426K Reputation points MVP

    Devops / TFS is not currently supported here on Q&A. The product group for Azure DevOps / TFS actively monitors questions over at

    --please don't forget to upvote and Accept as answer if the reply is helpful--

    0 comments No comments

0 additional answers

Sort by: Most helpful