Jazz Forum Welcome to the Jazz Community Forum Connect and collaborate with IBM Engineering experts and users

Eclipse client API: questions regarding unresolved files that require merge

Questions
Tags
Users
Badges
Gidi Gal
(96●20●58) Sep 23 '20, 5:12 a.m.
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 ?

0 votes

1 answer
1,597 views
0 votes

One answer

Permanent link
Shashikant Padur
JAZZ DEVELOPER (4.3k●2●7) Sep 25 '20, 5:47 a.m.

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().

0 votes

Your answer

Register or log in 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.

Ask a question
Guidelines
FAQ
Search context
Follow this question

By Email: 

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers
Answers and Comments
Question details
× 10,936
× 1,202

Question asked: Sep 23 '20, 5:12 a.m.

Question was seen: 1,597 times

Last updated: Sep 25 '20, 5:47 a.m.

Confirmation Cancel Confirm