Offline Database Definitions and Source Control Systems

You can work with offline database definitions and source control systems such as Oracle Software Configuration Manager (SCM), Rational ClearCase, and Concurrent Versions System (CVS), however you may come across problems with merge conflicts if more than one person is working with the same object, or if you work with more than one version of an object. This is because offline database definitions are handled within JDeveloper as XML files that contain generated internal identifiers, and these can cause conflicts on merging. The offline database XML files must not be hand edited otherwise they will cause errors, therefore the merge conflicts cannot be directly resolved. If you find yourself with merge conflicts for your offline database objects, cancel your source control transaction and obtain the latest version of the object, and add that to source control.

If you have a source control environment that uses strict locking, merge conflicts will never happen.

In a future release of JDeveloper, you will be able to to work with offline database definitions in a source controlled environment without having merge conflicts of this kind.

For more information about using source control systems with JDeveloper, see Using Support for Team Based Development.