pqm for bzr development

[John Arbash Meinel]

Alexander Belchenko wrote:
> What happened if during merge conflicts occurs? How this pqm handle this 
> situation?
> 
> Alexander
> 
> 
> 

In general, if there are conflicts the pqm rejects the merge request. I 
believe it sends you an email letting you know.

But it is designed that it requires a clean merge. Because otherwise it 
isn't creating the tree that you thought it was.

I would almost say that we could have the pqm require a pullable 
changeset (so something that has merged the current head). But since 
multiple people might be pushing patches at the same time, that is 
probably too much overhead for developers.

John
=:->