Let me add context first:
We are trying to add the engine source to the project repository in P4. We were trying to set it up like explained in Setting up an Unreal Engine Studio the Epic Way | Tutorial as shown in the image below.
As we understand, the purpose of this is to have a child stream with the unaltered official engine code. We are supposed to drop the new engine version there, then copy to the merge branch, merge from main to merge branch, resovle the conflicts, and copy back to main. That would get us an updated engine version in main. Is this understanding correct?
The issue now:
Say we have an engine modified file in main, when we merge to merge branch it will conflict with the one copied from engine which we can resolve. However, if this changes were already resolved in the last engine update, and the files havn’t been touched further since, there will not be any conflict, thus letting the new engine version copy upwards without resolution, deleting our old changes.
How is this issue to be dealt with?