Man Page conflicts.4

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  con-
     flict.  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 identi-
     fied 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

     Sun WorkShop TeamWare User's Guide

     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)