Conflict Resolution of Code Versions

This topic provides explanation on resolving version conflicts for database transactions.

When multiple users try to save changes to their local version of the program, a code conflict occurs. To resolve such code conflicts, and not to override changes made by other users, the Oracle® Database Navigator plug-in displays the code merge screen, with merge confirmation.

The Version Conflict Resolution for the <Procedure_name> window opens. This viewer screen is split in three parts displaying the "Database version", "Your version" and the "Result". You will be prompted to either merge your changes with the Result or roll back your changes.