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 | |
|---|---|---|---|---|---|
| Sep 11, 2010 at 0:20 | comment | added | gbjbaanb | tree conflicts: think of a directory as a text file with each subdir as a line. Now, add and delete lines from that file and merge - you'll get a conflict. This is exactly what's happening with tree conflicts, its just that the merge editor is non-existent (obviously as the answer is to copy dirs to the right place and mark as resolved). | |
| Sep 3, 2009 at 15:49 | vote | accept | Dean Schulze | ||
| Jul 29, 2009 at 14:17 | history | answered | Dean Schulze | CC BY-SA 2.5 |