[p4] Handling large number of manual merge conflicts

Slava Imeshev imeshev at yahoo.com
Fri Jun 11 11:52:28 PDT 2004


--- "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




More information about the perforce-user mailing list