[p4] Handling large number of manual merge conflicts

DAO, THOMAS (SBCSI) td4585 at sbc.com
Fri Jun 11 10:46:45 PDT 2004

Just wanted to get some feedback on how different shops handle a large
number of merge conflicts that need to be done manually.  Do you allow
the developers handle
the manual merges themselves?

Thomas Dao
Release Manager
SBC Online / SMARTpages.com
Tel: (626) 585-5380
Cell: (714) 943-7879
td4585 at sbc.com

More information about the perforce-user mailing list