Eric Berry elberry at gmail.com
Fri May 1 01:45:56 BST 2009

Hi Martin, thanks for the quick response!

I tried this:
bzr merge -r 3..2 .

This resulted in the changed files being marked as having conflicts.

If I run a bzr status just before performing the merge it shows that I do
not have any uncommitted changes.

Is there a way to not have to resolve the conflicted files?


On Thu, Apr 30, 2009 at 5:21 PM, Martin Pool <mbp at sourcefrog.net> wrote:

> 2009/5/1 Eric Berry <elberry at gmail.com>:
> > I looked at the help documentation for the merge command, and it looks
> like
> > I can do a merge from the higher revision to the lower revision, is this
> > correct? I also found this bug report
> > (https://bugs.launchpad.net/bzr/+bug/152008), but the steps there looked
> > much more complicated.
> >
> > Is the high to low revision merge the correct way to do this?
> That's correct.
> --
> Martin <http://launchpad.net/~mbp/ <http://launchpad.net/%7Embp/>>

Learn from the past. Live in the present. Plan for the future.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090430/d72cb3fc/attachment.htm 

More information about the bazaar mailing list