conflicts should be given better names than .moved
Bug #722892 reported by
David Strauss
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Medium
|
Unassigned | ||
Bug Description
When I merge and get a contents conflict (which itself should be renamed "path conflict" to clarify that the conflict is about two different IDs claiming the same path), the directory on my site gets renamed to *.moved. Since it's always *my* branch's item that gets moved, the renaming ought to be something like *.THIS to clarify that it's what was mine. Right now, I keep having to look at the output from the merge to understand what side *.moved is from.
Revision history for this message
| Martin Pool (mbp) wrote | #1 |
| summary: |
- When a file or directory has a contents conflict, naming should be more - clear + conflicts should be given better names than .moved |
| Changed in bzr: | |
| status: | New → Confirmed |
| importance: | Undecided → Medium |
| tags: | added: conflicts merge |
| tags: | added: check-for-breezy |
To post a comment you must log in.
Good idea.