Sun WorkShop TeamWare 2.1 User's Guide

Conflicts

Bringover Update transactions often produce conflicts (when files are changed in both the parent and child). When this occurs, you are so notified by messages in the Transaction Output window. See Chapter 9, Resolving Conflicts," for details about resolving conflicts.