Identify committer/author in merge conflicts
Bug #318919 reported by
inactive
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Confirmed
|
Low
|
Unassigned | ||
Bug Description
Submitter believes this will make people understand that they should blame others for conflicts, not their VCS.
Revision history for this message
| Aaron Bentley (abentley) wrote | #1 |
| description: | updated |
| Changed in bzr: | |
| importance: | Undecided → Low |
| status: | New → Triaged |
| Changed in bzr: | |
| status: | Triaged → Confirmed |
| tags: | added: merge |
| tags: |
added: conflicts removed: merge |
| tags: | added: check-for-breezy |
| tags: | removed: check-for-breezy |
To post a comment you must log in.
Considering the conflicting text may come from many revisions and have many authors, it does not seem that this change could be made without breaking compatibility with existing tools. It could easily make the conflict hard to read, too.
In the end, what you want is annotation of the merge conflict. We already have annotation support in bzr, bzr-gtk and qbzr.