Bazaar

  1. Bug #116655
  2. Comment #2

Comment 2 for bug 116655

Revision history for this message
Bubba Siggler (bud3) wrote : Re: [Bug 116655] Re: Too many conflicts on 'bzr update'

On 5/24/07, Robert Collins <email address hidden> wrote:
>
> *** This bug is a duplicate of bug 113809 ***
> https://bugs.launchpad.net/bugs/113809
>
> ** This bug has been marked a duplicate of bug 113809
> update performs two merges

Hi,
do I run the file bzr run 2_conflict, or use the install or merge.

bubba

--
> Too many conflicts on 'bzr update'
> https://bugs.launchpad.net/bugs/116655
> You received this bug notification because you are a member of Bazaar
> Developers, which is the registrant for Bazaar.
>

--
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFFkcN7yXWcajQQndYRAgbqAKCMyXN9Jx4g0X7jocg+aUSFz0x4LwCgrURW
eGtqLjpzQVYa9+gzpCRtB84=
=zrpM
-----END PGP SIGNATURE-----