[Bug 906370] Re: merging generated conflicts which were resolved in merged branch

2019-06-15 Thread Jelmer Vernooij
** Tags removed: check-for-breezy

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/906370

Title:
  merging generated conflicts which were resolved in merged branch

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/906370/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

[Bug 906370] Re: merging generated conflicts which were resolved in merged branch

2017-11-08 Thread Marcin Juszkiewicz
Wow. 6 years old bug. Muted as I stopped caring about bzr over 4 years
ago.

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/906370

Title:
  merging generated conflicts which were resolved in merged branch

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/906370/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

[Bug 906370] Re: merging generated conflicts which were resolved in merged branch

2017-11-08 Thread Jelmer Vernooij
** Tags added: check-for-breezy

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/906370

Title:
  merging generated conflicts which were resolved in merged branch

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/906370/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

[Bug 906370] Re: merging generated conflicts which were resolved in merged branch

2012-03-25 Thread Jelmer Vernooij
** Also affects: bzr
   Importance: Undecided
   Status: New

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/906370

Title:
  merging generated conflicts which were resolved in merged branch

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/906370/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs


[Bug 906370] Re: merging generated conflicts which were resolved in merged branch

2011-12-19 Thread Marcin Juszkiewicz
** Summary changed:

- merging generated conflicts which should be handled
+ merging generated conflicts which were resolved in merged branch

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/906370

Title:
  merging generated conflicts which were resolved in merged branch

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/906370/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs