Timeline for svn merge functionality broken by tree conflicts
Current License: CC BY-SA 2.5
3 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Aug 2, 2010 at 1:34 | comment | added | darreljnz | -1 : I get this error on a fresh merge with no previous merges. I believe it is two tree conflicts in the same merge causing the issue. | |
| Apr 16, 2010 at 8:17 | comment | added | PEELY | I just had "Attempt to add tree conflict that already exists" doing a brand new merge. Followed by "Error reading spooled REPORT request response" | |
| Jul 28, 2009 at 14:06 | history | answered | Wim Coenen | CC BY-SA 2.5 |