CVS Unreserved Checkouts

Merging code changes

When you update your local copy of the repository CVS automatically merges in changes from other users. CVS may indicate that there are errors by giving the "Conflict" indicator.

If you open the file in a text editor (do not open it in the IDF), you will see there are conflicts noted by the string <<<<<<< and >>>>>.

Fix the conflicting code and remove the indicators and save the file.

A methodology to Uniface source code control
How to get and install CVS
Introduction and Configuration
Taking control
Releasing a form
Checking a form in
Releasing a form and application model
Releasing registers
Adding a form
Merging code changes
Final notes

UD6 Overview

$Revision: 1.10 $ $Date: 2011/02/28 02:56:32 $[go to top]