In RTC 5.0.2: Unable to resolve the conflict occured for both outgoing and incoming change sets of the same file.
Hi All,
I was following this article "https://jazz.net/library/article/1439" as an example for my practice but stucked on the step where I need to resolve the conflicts occurred on the same file for both outgoing and incoming.
When I try to accept incoming changes or deliver outgoing changes, it throws below error:
CRRTC5042E: Cannot deliver changes since they would create conflicts for item '/Calculator_Plus_Module/Calculator_Plus_Module/Form1.cs' in component 'Component 'User1_Calculator_PlusModule''. Try accepting all incoming changes, resolve the conflicts, then deliver again.
I have also tried to resolve this issue with the following link but no luck.
https://jazz.net/help-dev/clm/index.jsp?re=1&topic=/com.ibm.team.scm.doc/topics/t_scm_conflict_content.html&scope=null
Do we need to merge the files? If yes, then any assistance on it will be very helpful.
Regards,
Muhammad Moid
I was following this article "https://jazz.net/library/article/1439" as an example for my practice but stucked on the step where I need to resolve the conflicts occurred on the same file for both outgoing and incoming.
When I try to accept incoming changes or deliver outgoing changes, it throws below error:
CRRTC5042E: Cannot deliver changes since they would create conflicts for item '/Calculator_Plus_Module/Calculator_Plus_Module/Form1.cs' in component 'Component 'User1_Calculator_PlusModule''. Try accepting all incoming changes, resolve the conflicts, then deliver again.
I have also tried to resolve this issue with the following link but no luck.
https://jazz.net/help-dev/clm/index.jsp?re=1&topic=/com.ibm.team.scm.doc/topics/t_scm_conflict_content.html&scope=null
Do we need to merge the files? If yes, then any assistance on it will be very helpful.
Regards,
Muhammad Moid
2 answers
Hi Muhammad,
If your usecase is to resolve conflict between two streams.
1) Stream1 is flow target to Stream2
2) RWS1 is Flow Target to Stream1
3) hello.java common file has been modified from two different location ( eg: Stream1 and Stream2)
4) Now the conflict accours when you try to deliver the changes from RWS1 to Stream1 ( Assumeing the hello.java file has modified and deliver by other user into Stream2)
4) Change the flow target of RWS1 to Stream2
5) Accept the changes into RWS1
6) Change the flow target back to RWS1 to Stream1
7) Resolve the conflict using on of the below options.
a) Auto Resolve
b) Resolve with proposed
c) Resolve with mine
d) Open in compare editor ( do it manually)
Save the changes and it will create a new Changeset and it can be Delivered .
8) Deliver the changes from RWS1 to Deliver1
Note: If you don't have any latest common changes , their shouldn't be any conflict between stream1 <> Stream2
9) Deliver the changes from Stream1 to Stream2
Please let me know if you need any further information.
Regards,
Arun.
If your usecase is to resolve conflict between two streams.
1) Stream1 is flow target to Stream2
2) RWS1 is Flow Target to Stream1
3) hello.java common file has been modified from two different location ( eg: Stream1 and Stream2)
4) Now the conflict accours when you try to deliver the changes from RWS1 to Stream1 ( Assumeing the hello.java file has modified and deliver by other user into Stream2)
4) Change the flow target of RWS1 to Stream2
5) Accept the changes into RWS1
6) Change the flow target back to RWS1 to Stream1
7) Resolve the conflict using on of the below options.
a) Auto Resolve
b) Resolve with proposed
c) Resolve with mine
d) Open in compare editor ( do it manually)
Save the changes and it will create a new Changeset and it can be Delivered .
8) Deliver the changes from RWS1 to Deliver1
Note: If you don't have any latest common changes , their shouldn't be any conflict between stream1 <> Stream2
9) Deliver the changes from Stream1 to Stream2
Please let me know if you need any further information.
Regards,
Arun.
Comments
Comments
Chris McGee
FORUM MODERATOR / JAZZ DEVELOPER Oct 20 '15, 3:06 p.m.Muhammad Moid
Oct 21 '15, 3:03 a.m.