It's all about the answers!

Ask a question

Merging changes with deleted file

Khelmo Freitas (153) | asked Apr 18 '16, 12:11 p.m.

I have the following situation:
Stream A flows to Stream B

A File in stream B has change 1 and change 2 pending deliver to stream B (change 2 is actual deletion of the file)

Then I had to do a fix directly in Stream B for this file, let's call it change 3 (loaded a repository B for stream B and delivered straight to it)

Now change 3 appears as incoming from Stream B to Stream A

When trying to accept change 3 into Stream A it reports an error saying I should resolve conflicts

I load a repository A for stream A but change 3 does not appear in the incoming folder of Repository A - Stream A

How can I resolve this so there are no incoming changes for stream A anymore??

Accepted answer

permanent link
Arun K Sriramaiah (3.2k12258) | answered Apr 19 '16, 4:50 a.m.
Hi Khelmo,

Please find the blog below and let me know does it helps.

Khelmo Freitas selected this answer as the correct answer

Your answer

Register or to post your answer.