| 2009-09-25 12:06:52 |
Tymek |
bug |
|
|
added bug |
| 2009-09-25 13:46:25 |
Tymek |
summary |
Adding a file+Merging resutls in "Conflict adding files to FILE_NAME_HERE. Moved to root." |
Provide a better message for "Conflict adding files to FILE_NAME_HERE. Moved to root." |
|
| 2010-03-17 03:27:45 |
Martin Pool |
tags |
|
conflicts merge |
|
| 2010-03-17 03:32:08 |
Martin Pool |
summary |
Provide a better message for "Conflict adding files to FILE_NAME_HERE. Moved to root." |
confusing conflicts when adding files to roots with different ids |
|
| 2010-03-17 03:32:47 |
Martin Pool |
bzr: importance |
Undecided |
Low |
|
| 2010-03-17 03:32:47 |
Martin Pool |
bzr: status |
New |
Confirmed |
|
| 2017-11-09 00:34:16 |
Jelmer Vernooij |
tags |
conflicts merge |
check-for-breezy conflicts merge |
|
