It's all about the answers!

Ask a question

how to compare conflicts between the 2 files withouth loading the content?

Pravin Patil (104139133) | asked Nov 17 '15, 7:30 p.m.
For my project, I switch flow targets to flow changes from StreamA into StreamB. I do this in my workspace.
After accepting changes, and if there is a conflict, I want to share the workspace with the developer so that he can see the conflicts between 2 files in question.
So, the developer searchs for shared workspace > "Show in pending changes" > and he sees the unresolved director which is having the conflict. He doesnt want to load the workspace as it is huge and takes more then 30 minutes. But he tries to open this conflicted file (from the unresolved directory), it asks him to load the workspace.
Is there a way to see the files conflicts without loading the workspace?

Please let me know.

Pravin Patil commented Nov 18 '15, 12:48 p.m.

 Please let me know...

One answer

permanent link
Surya Tripathi (65017) | answered Dec 09 '15, 9:12 p.m.
 In order to resolve or view the conflicts in Eclipse editor you do need to load the file first. Instead of loading the entire workspace, you can just load the affected component and view the conflicts.

Your answer

Register or to post 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.