My Oracle Support Banner

ABILITY TO PROVIDE A THIRD OPTION FOR NON-TRIVIAL MERGE CONFLICT RESOLUTION (Doc ID 2460879.1)

Last updated on NOVEMBER 22, 2019

Applies to:

Siebel Tools - Version 18.7 and later
Information in this document applies to any platform.

Goal

In a development environment where multiple users work in parallel making configuration changes concurrently in their own private workspaces, conflicts might arise when the same objects and attributes are modified by different users in their own private workspaces, and then the changes from these users are delivered to the main branch. These situations often lead to non-trivial merges because of the conflicting changes between different users.

When the Rebase is done, the developer has to choose what change to keep from the existing ones. Is it possible to provide another input for the same record?
 

Solution

To view full details, sign in with your My Oracle Support account.

Don't have a My Oracle Support account? Click to get started!


In this Document
Goal
Solution
References


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