| 2009-01-19 19:48:43 |
inactive |
bug |
|
|
added bug |
| 2009-01-20 00:47:11 |
Aaron Bentley |
description |
As described here http://www.versioncontrolblog.com/2008/12/17/rfc-lets-make-textual-conflicts-more-personal/
Would be nice to add some personalizing information at the point of merge conflicts. Definitely adds nice pointers in the merging context. |
Submitter believes this will make people understand that they should blame others for conflicts, not their VCS. |
|
| 2009-01-20 00:47:11 |
Aaron Bentley |
title |
Personalize merge conflicts |
Identify committer/author in merge conflicts |
|
| 2009-01-20 00:50:24 |
Aaron Bentley |
bzr: status |
New |
Triaged |
|
| 2009-01-20 00:50:24 |
Aaron Bentley |
bzr: importance |
Undecided |
Low |
|
| 2009-01-20 00:50:24 |
Aaron Bentley |
bzr: statusexplanation |
|
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. |
|
| 2010-03-19 01:00:52 |
Martin Pool |
bzr: status |
Triaged |
Confirmed |
|
| 2011-02-02 00:12:43 |
Jelmer Vernooij |
tags |
|
merge |
|
| 2011-02-02 00:12:50 |
Jelmer Vernooij |
tags |
merge |
conflicts |
|
| 2017-11-09 00:32:35 |
Jelmer Vernooij |
tags |
conflicts |
check-for-breezy conflicts |
|
| 2018-03-29 01:40:16 |
Jelmer Vernooij |
tags |
check-for-breezy conflicts |
conflicts |
|
