On 05/05/11 09:32, Richard Sandiford wrote:
But just to be clear, in the kind of situation where person A has pushed a new revision while person B was doing a merge, what should person B do when the push fails? Should they undo the local merge, pull, then merge again? Or is there a better way? Do you mean that:
BTW, there is a bzr plugin named 'rewrite' that adds a 'rebase' command that works better in the case of diverged branches. It's slow as hell though.
this is the right thing to do instead?
Yes, with the rewrite plugin you can just do:
bzr rebase [while conflict] [...fix conflict...] bzr rebase-continue bzr push
However, I have to say that doing it manually might be faster (if you don't have many commits) and you don't need the plugin:
bzr pull --overwrite /* wipe local changes */ bzr merge .... [...fix conflicts...] bzr commit bzr push
Andrew