An follow-up after resolving evil-twin
Our scenario is like this:
Feature Stream
- change set a: add file a.txt
- change set b: modify a.txt
Mainline Stream
- change set c: add file a.txt
private workspace <-> Mainline Stream
- out going : c
- incoming : a, b
First, in our workspace we accepted change set a. Then resolve this "evil-twin" as mine. I understand for file a.txt, it will only keep the history of c.
Later, we accept change set b. Then conflict was shown as deleted<->modified.
Problem :
We want to merge the change of b back to mainline. But when we use merged with proposed, it will ask me to move the conflicted file. I think the solution should delete the local a.txt which reference by change set c to resolve the move conflict but no success. Is there any solution?
|
One answer
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.