It's not still happening.
It appears to have been fixed in r1987. (It's verified fixed as of
r4230, but that rev introduces a format horizon that prevents me from
testing (easily enough to be worth the bother) any further back than
that.)
** Changed in: bzr
Status: Incomplete => Fix Relea
I'm not sure it's still happening.
** Changed in: bzr
Status: In Progress => Incomplete
--
Confusing merge conflict message when directory removed
https://bugs.launchpad.net/bugs/47764
You received this bug notification because you are a member of Ubuntu
Bugs, which is a subscriber of a d
No, I don't. Are you sure it's still happening, and not a similar error
message, and not this message in different circumstances?
--
Confusing merge conflict message when directory removed
https://bugs.launchpad.net/bugs/47764
You received this bug notification because you are a member of Ubuntu
** Tags added: easy
--
Confusing merge conflict message when directory removed
https://bugs.launchpad.net/bugs/47764
You received this bug notification because you are a member of Ubuntu
Bugs, which is a subscriber of a duplicate bug.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
htt
Aaron, this was previously (anciently) marked fix-committed. Do you
have a patch for this?
** Tags added: conflicts ignore merge
** Changed in: bzr
Status: Fix Committed => In Progress
--
Confusing merge conflict message when directory removed
https://bugs.launchpad.net/bugs/47764
You r
** Changed in: bzr (upstream)
Assignee: (unassigned) => Aaron Bentley
Status: Unconfirmed => Fix Committed
--
Confusing merge conflict message when directory removed
https://launchpad.net/bugs/47764
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/ma
** Bug 47802 has been marked a duplicate of this bug
--
Confusing merge conflict message when directory removed
https://launchpad.net/bugs/47764
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
