CRRTC5041E: Error while pushing code to RTC

As the error suggests, in your pending changes view you should see files that have conflicts in the component. You need to first resolve these conflicts before continuing with the deliver operation.

Hi Anil,

Please find the link below for resolving conflict and it should be done wrt RWS level.Stream1 is flow target to Stream2.

1.   Repository Workspace RWS1 is Flow Target to Stream1.
    
2. hello.java common file has been modified from two different location (e.g: RWS1 and RWS2 using common Stream1).
    
3. Now the conflict occurs when you try to deliver the changes from RWS1 to Stream1  (assuming the hello.java file was modified and delivered by another user from RWS2 ). 
    
4. Refresh and Accept the changes into RWS1. 
    
5. Resolve the conflict using one of the below options.
    
   • Auto Resolve
   • Resolve with proposed
   • Resolve with mine
   • Open in compare editor ( do it manually)
      

Save the changes.  It will create a new Changeset and it can be Delivered.
 

  6. Deliver the changes from RWS1 to Stream1.

** Resolving Conflicts

https://jazz.net/library/article/39

** Stream to Stream Conflict

https://www.ibm.com/developerworks/community/blogs/nfrsblog/entry/Resolving_common_file_conflict_between_two_different_RTC_Streams?lang=en

Please let me know if does it helps.

Regards,
Arun.