[p4] Handling large number of manual merge conflicts

Noel Yap Noel.Yap at morganstanley.com
Fri Jun 11 11:16:46 PDT 2004


IME, if "Merge Early and Often" is followed, large numbers of conflicts can be avoided.

Noel

Hoff, Todd wrote:

> We had a group that did a great job of merging
> between branches. As a developer i appreciated
> all the work it saved me and would recommend
> this approach highly if you can find the
> right people to do it.
> 
> As the group contracts though it seems developers
> will have to perform the merges. Developers
> as mergers encourages a flatter branching structure
> with fewer longer term feature branches.
> 
> With a separate group you could support a more complex
> branch structure transparently to the developers.
> Which is both good and bad.
> 
> In all cases you'll need good tests to verify 
> functionality.
> 
> 
> 
> 
>>-----Original Message-----
>>From: DAO, THOMAS (SBCSI) [mailto:td4585 at sbc.com]
>>Sent: Friday, June 11, 2004 10:47 AM
>>To: perforce-user at perforce.com
>>Subject: [p4] Handling large number of manual merge conflicts
>>
>>
>>
>>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
>>
>>
>>_______________________________________________
>>perforce-user mailing list  -  perforce-user at perforce.com
>>http://maillist.perforce.com/mailman/listinfo/perforce-user
>>
> 
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
> 



More information about the perforce-user mailing list