ODI 12c Configured with VCS - "Restore with Merge" of Object Results in Unresolvable Name Conflict (Doc ID 2373749.1)

Last updated on JUNE 16, 2022

Applies to:

Symptoms

Oracle Data Integrator (ODI) 12c has been configured with a Version Control System (VCS), i.e. Apache Subversion (SVN) or Git. 

In an ODI Repository connected to VCS (trunk or branch), when restoring an object with "restore with merge" selected and involving a Mapping that was renamed, a conflict is reported in regards to "name".

There appears to be no way to resolve the conflict.

To reproduce the behavior:

1. Modify a Mapping in branch ODI repository, i.e.: from "test" to "test_mod".
            
2. Create new Version in branch ODI Repository and create a Tag.
               
3. In Trunk ODI Repository, merge the new Tag.
         
4. Create Version.
             
5. Select the Mapping, right-click, select "Restore from VCS" and check "restore with merge". Select the initial Version.
   
   The merge conflict Resolution will show that there is a conflict between the old name and new name, and there is no way to resolve the conflict.

Cause

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