Timeline for svn merge functionality broken by tree conflicts
Current License: CC BY-SA 2.5
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 28, 2012 at 2:31 | answer | added | David | timeline score: 0 | |
| Aug 12, 2011 at 16:57 | comment | added | Tim Keating | SVN didn't add tree conflicts as a feature; they are intrinsic to the nature of revision control. Now, you could make the point that SVN does a poor job handling and/or messaging about tree conflicts, but at least it DOES detect them and tries to let you know what's going on. | |
| Mar 21, 2011 at 18:19 | history | edited | yegor256 | CC BY-SA 2.5 |
polished
|
| Sep 3, 2009 at 15:49 | vote | accept | Dean Schulze | ||
| Jul 29, 2009 at 14:17 | answer | added | Dean Schulze | timeline score: 15 | |
| Jul 28, 2009 at 14:06 | answer | added | Wim Coenen | timeline score: 11 | |
| Jul 27, 2009 at 20:39 | answer | added | Laurynas Biveinis | timeline score: 2 | |
| Jul 27, 2009 at 20:09 | history | asked | Dean Schulze | CC BY-SA 2.5 |