Share via

How to resolve conflicts in devops

NishimuraChinatsu-9854 756 Reputation points
2022-09-06T02:37:45.37+00:00

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.

Community Center | Not monitored
0 comments

Answer accepted by question author

Anonymous
2022-09-06T03:14:35.917+00:00

Devops / TFS is not currently supported here on Q&A. The product group for Azure DevOps / TFS actively monitors questions over at
https://developercommunity.visualstudio.com/report?space=21&entry=problem
https://developercommunity.visualstudio.com/report?space=22&entry=problem
https://azure.microsoft.com/en-in/support/devops/

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

Was this answer helpful?

0 comments

0 additional answers

Sort by: Most helpful
Most helpful Newest Oldest

Your answer

Answers can be marked as 'Accepted' by the question author and 'Recommended' by moderators, which helps users know the answer solved the author's problem.