failure rebasing a merge
Bug #126743 reported by
Jelmer Vernooij
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-rewrite |
Fix Released
|
High
|
Jelmer Vernooij |
Bug Description
as reported by dato on IRC:
$ b get -r 2540 bzr.dev B
$ cd B
$ echo hi >>NEWS
$ b ci -m foo
$ b merge -r 2552
$ b ci -m merge
$ b rebase
results in conflicts.
Changed in bzr-rebase: | |
importance: | Undecided → High |
status: | New → Triaged |
Changed in bzr-rebase: | |
assignee: | nobody → jelmer |
status: | Triaged → Fix Committed |
To post a comment you must log in.
status triaged
importance high