Eclipse client API: questions regarding unresolved files that require merge
Hello,
My questions relate to the following scenario:
1) User has an unresolved file.
2) The file is also part of incoming change-set.
3) User accepts the change-set. As a result, the file requires merge.
I need to find out when file is in that state. I found out that
com.ibm.team.filesystem.rcp.core.internal.changes.util.ComponentSyncContext;.getLocalConflictSource() contains instance of the file in such scenario.
My questions:
1) Are the instances in this container relevant only to the scenario I mentioned ? Are there other scenarios that add instances to this container ?
2) Is there a parallel public API to find such instances ?
|
One answer
After accepting the change set, if you have not merged the files, then the files are in conflict. To get the conflict report:
IWorkspaceConnection.conflictReport.conflicts().
|
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.