error resolving conflict after file has been removed from tree
Bug #457793 reported by
Chris S.
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Bug Description
I had a problem the other day when working with a couple branches. I had 2 branches. Upon merging the two, a text conflict was reported in one of the files. I ignored this because my intention was to bzr remove the entire directory that this particular file was in. Upon bzr removing the directory, and trying to bzr commit, bzr reported that a text conflict still existed. After a bzr resolve, I got an error from bzr stating:
bzr: ERROR: The file id "......
Thanks to some help from the people in #bzr, I was informed that bzr resolve --all would fix this, but was told to still report a bug.
| tags: | added: conflicts |
| Changed in bzr: | |
| status: | New → Confirmed |
| importance: | Undecided → Medium |
| tags: | added: check-for-breezy |
To post a comment you must log in.
