11 messages in com.perforce.perforce-user[p4] Handling large number of manual ...
FromSent OnAttachments
DAO, THOMAS (SBCSI)11 Jun 2004 10:46 
Hoff, Todd11 Jun 2004 11:06 
Noel Yap11 Jun 2004 11:16 
Hoff, Todd11 Jun 2004 11:22 
Noel Yap11 Jun 2004 11:30 
Slava Imeshev11 Jun 2004 11:52 
Hoff, Todd11 Jun 2004 11:54 
Hoff, Todd11 Jun 2004 12:09 
Noel Yap11 Jun 2004 12:12 
Hoff, Todd11 Jun 2004 12:24 
Noel Yap11 Jun 2004 12:38 
Subject:[p4] Handling large number of manual merge conflicts
From:Slava Imeshev (imes@yahoo.com)
Date:06/11/2004 11:52:06 AM
List:com.perforce.perforce-user

--- "DAO, THOMAS (SBCSI)" <td4585 at sbc.com> wrote:

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?

One of the best practices is to make developers do integs. Who else but developers know how to integ changes while preserving semantics of changes?

Also it's useful to set up integration nags to encourage developers to integrate soon - the longer integration backlog, the higher chances of conflicts, the harder to integ, and that's what you're facing now.

Hope this helps.

Regards,

Slava Imeshev