."
." Copyright (c) 1991 by Sun Microsystems, Inc.
."
." @(#)conflicts.4	1.5	92/03/03 SMI
."
.TH CONFLICTS 4 "01 December 1992"
.SH NAME
conflicts \- List of files in conflict in a workspace
.SH SYNOPSIS
.B Codemgr_wsdata/conflicts
.LP
.SH DESCRIPTION
The file 
.IB ws /Codemgr_wsdata/conflicts
(where 
.I ws
is the name of a workspace) is a text file that contains a list of
files that the
.B bringover
command has identified as being in conflict.  Path names are listed
relative to the workspace root directory, one per line.  For example:
.sp
.in +3
.SM VERSION 1
.sp 0
man/man1/bringover.1
.sp 0
man/man1/putback.1
.in -3
.sp
This list is consulted by the 
.B resolve
command when it is invoked to determine which files in the specified workspace
require resolving.
.LP
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
.B bringover
command enters the conflicting file name in the 
.B conflicts 
file, and the 
.B resolve
command removes the file name after the conflict is resolved.
.SH "SEE ALSO"
.IR "Sun WorkShop TeamWare User's Guide"
.LP
.sp 
.nf
bringover(1), codemgr(1), def.dir.flp(1), dmake(1), freezept(1), 
putback(1), rcs2ws(1), resolve(1), teamware(1), twbuild(1), 
twfreeze(1), twmerge(1), twversion(1), workspace(1), 
ws_undo(1), access_control(4), args(4), children(4), 
description(4), freezepointfile(4), history(4), locks(4), 
nametable(4), notification(4), parent(4), putback.cmt(4)