[Bf-committers] Slow merges with recent changes

Αντώνης Ρυακιωτάκης kalast at gmail.com
Mon Oct 24 21:42:35 CEST 2011

Previous message: [Bf-committers] Slow merges with recent changes
Next message: [Bf-committers] Proposal for "View Docs" on Right Click
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

In my case I used svn merge -r41226:41227 --accept=theirs-conflict

This takes care of diffing only the $Id$ conflicts from this and the
next 4 commits

Previous message: [Bf-committers] Slow merges with recent changes
Next message: [Bf-committers] Proposal for "View Docs" on Right Click
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Bf-committers mailing list