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

New file in sandbox - is it in conflict with incoming change-set (using Java API)

Hello to the forum members,

I have a new file which was delivered into stream. I create in another workspace in the same path a file with the same name. I have IShareable of my created file. Suppose I have also the incoming IChangeSet of the delivered file. How do I know these files represent the same item and are in conflict ?

Thanks,
Gidi

0 votes



One answer

Permanent link
Your new file and the incoming change with the same name are two different items.
If you have checked in the changes to your change set then in the GUI/CLI clients the change will be shown to have a potential conflict. If you accept the change set then the actual conflict will be reported as Add-Add conflict.
The conflict report should give you details about the conflict. 

0 votes

Comments

Hi Shashikant,
When I'm trying to deliver a change-set with new file which is in future-conflict with incoming change-set - I will get error:
"Cannot deliver changes since they would create conflicts for component 'Component 'CmpA''. Try accepting all incoming changes, resolve the conflicts, then deliver again."
I am automating deliver operation in an extension I develop. I need to identify such a future conflict so I can avoid calling deliver and so I can alert my users about this issue.
Is there a public API to identify this future conflict ?
Thanks,
Gidi


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.

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,952
× 1,204

Question asked: Oct 26 '17, 7:06 a.m.

Question was seen: 2,530 times

Last updated: Oct 30 '17, 8:03 a.m.

Related questions
Confirmation Cancel Confirm