[ANN][PLUGIN] external merge

[Martin Pool]

On Mon, 2006-02-20 at 09:15 -0600, John A Meinel wrote:
> > Throwing up a conflict resolution interface (optionally) directly after
> > a merge sounds good, but I prefer triple-checking before committing the
> > result. Some people might like that feature, could get messy with
> > non-merge changes being present.
> > 
> 
> I don't think bzr will ever commit a merge without user review. It is
> something that all of the main developers prefer. I suppose someone
> could write a plugin which has a post-merge step that checks to see if
> there are conflicts, and if not, calls 'bzr commit', but that would
> definitely not be a mainline feature.

I second that.

-- 
Martin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060221/10bb560b/attachment.pgp