http://muffinresearch.co.uk/archives/2007/06/05/dealing-with-conflicts-in-bazaar-version-control/ the personal blog of Stuart Colville covering modern web development techniques and best practices Mon, 13 Oct 2008 13:37:20 +0000 http://wordpress.org/?v=2.5.1 http://muffinresearch.co.uk/archives/2007/06/05/dealing-with-conflicts-in-bazaar-version-control/#comment-48425 Tomasz Gorski Wed, 27 Jun 2007 15:35:28 +0000 http://muffinresearch.co.uk/archives/2007/06/05/dealing-with-conflicts-in-bazaar-version-control/#comment-48425 I found that: If we consider the users tree-id as base, the users current tree as this and the tree the undo was done against as other it would work : but we need to record the tree-id the undo was done against as part of the 'undo' process. I found that: If we consider the users tree-id as base, the users current tree as this and the tree the undo was done against as other it would work : but we need to record the tree-id the undo was done against as part of the ‘undo’ process.

]]>