NAME

conflicts − List of files in conflict in a workspace

SYNOPSIS

Codemgr_wsdata/conflicts

DESCRIPTION

The file ws/Codemgr_wsdata/conflicts (where ws is the name of a workspace) is a text file that contains a list of files that the bringover command has identified as being in conflict.  Path names are listed relative to the workspace root directory, one per line.  For example:

VERSION 1
man/man1/bringover.1
man/man1/putback.1

This list is consulted by the resolve command when it is invoked to determine which files in the specified workspace require resolving. 

Files are said to be in conflict when they have changed in both the parent and child workspaces.  Conflicts are identified during bringover transactions.  The bringover command enters the conflicting file name in the conflicts file, and the resolve command removes the file name after the conflict is resolved. 

SEE ALSO

TeamWare User’s Guide
bringover(1), def.dir.flp(1), fileresolve(1), putback(1), resolve(1), twmerge(1), ws_undo(1), workspace(1), access_control(4), args(4), children(4), history(4), locks(4), nametable(4), notification(4), parent(4), putback.cmt(4)

SunOS WorkShop_4.2  —  Last change: 01 December 1992