bzr mv a conflicted path should resolve it
Bug #557815 reported by
Robert Collins
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Wishlist
|
Unassigned | ||
Bug Description
affects bzr
importance wishlist
status confirmed
done
I had a path conflict:
conflicts:
Path conflict: apport / contrib/apport
I did 'bzr mv contrib/apport apport'. This should have resolved the
conflict for me.
-Rob
