Conflict Resolution Merges Branches With Unexpected Behavior (Doc ID 2937654.1)

Last updated on JULY 18, 2024

Applies to:

Goal

When starting the Conflict Resolution process, as part of a Merge Request, the target branch adds files to the review branch . This means that when merging the review branch with another, different target branch, files that are not needed (because they were not part of the original review branch) are transferred to it.

For example, if the review branch has the files 1.sql and 2.sql and the target branch has the files 3.sql and 4.sql, after the conflict resolution the review branch will have the 1.sql, 2.sql, 3.sql and 4.sql files.

Is there any way to stop the process of copying the contents of the target branch to the review branch when the Conflict Resolution process is run?
 

Solution

My Oracle Support provides customers with access to over a million knowledge articles and a vibrant support community of peers and Oracle experts.