It's all about the answers!

Ask a question

Merge file between two streams located in different components with history


vinay kumar bondugula (5411841) | asked Jun 18 '20, 7:08 a.m.

Hi All,


We are having  Automerge process in a project area (Between 2 streams) , we face a scenario and we need your support for this issue

Automerge is done from development stream(B) to Integration stream (A). 
File: default_apis.yaml
o This file is present in X component of the  stream B.
o This file is present in Y component of the stream A.
So when we merge these 2 streams we are facing issue in this file , since this file location differs.
Due to which we are not able to maintain the history of this file and in order to resolve this , we manually do the changes in that specific file in the stream A.

Please let us know in case we have a procedure to merge the changes without moving the file and with history.

Thanks,
Vinay


One answer



permanent link
Geoffrey Clemm (29.6k23035) | answered Jun 18 '20, 3:36 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER

Unless the file in component Y was created by applying "move in repository" operation to that file in component X (or vice versa), RTC/EWM will consider these two files as completely separate.   So if there is any "merging" that you want to have happen, you will have to invoke the merge tool manually pointing it at those two files ... it will not appear as a "conflict" when you do an accept operation.

Your answer


Register or to post your answer.