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.
>
On 5/24/07, Robert Collins <email address hidden> wrote: /bugs.launchpad .net/bugs/ 113809
>
> *** This bug is a duplicate of bug 113809 ***
> https:/
>
> ** 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
-- /bugs.launchpad .net/bugs/ 116655
> Too many conflicts on 'bzr update'
> https:/
> You received this bug notification because you are a member of Bazaar
> Developers, which is the registrant for Bazaar.
>
--
cajQQndYRAgbqAK CMyXN9Jx4g0X7jo cg+aUSFz0x4LwCg rURW gzpCRtB84=
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
iD8DBQFFkcN7yXW
eGtqLjpzQVYa9+
=zrpM
-----END PGP SIGNATURE-----