StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Well, <a href="https://stackoverflow.com/questions/15221544/svn-merge-tree-conflict-wierd">real sample of strange and bad merge</a> caught and registered in real-world</p> <ol> <li>File added in branch</li> <li>Through two merges (branch -> trunk -> another branch) file appeared in another branch</li> <li>File edited in branch-target</li> <li>Merge branch to trunk failed after it with "Tree conflict" for file in question</li> </ol> <p><code>r9 | Badger | 2013-03-06 11:42:34 +0600 (Ср, 06 мар 2013) | 1 line Changed paths: M /branches/B2/src/add.txt</code></p> <pre><code>B2 changes in add.txt ------------------------------------------------------------------------ r8 | Badger | 2013-03-06 11:35:45 +0600 (Ср, 06 мар 2013) | 2 lines Changed paths: M /branches/B2 M /branches/B2/core.txt A /branches/B2/src/add.txt (from /trunk/src/add.txt:7) Merge from trunk to B2 ------------------------------------------------------------------------ r6 | Badger | 2013-03-06 11:31:36 +0600 (Ср, 06 мар 2013) | 1 line Changed paths: M /trunk M /trunk/core.txt A /trunk/src/add.txt (from /branches/B1/src/add.txt:5) Merge from B1 to trunk ------------------------------------------------------------------------ r5 | Badger | 2013-03-06 11:28:58 +0600 (Ср, 06 мар 2013) | 1 line Changed paths: M /branches/B1/core.txt A /branches/B1/src/add.txt B1 changes ------------------------------------------------------------------------ </code></pre> <p>Merge attempt from b2 to trunk (expected result - merge changes for <code>src/add.txt</code> into trunk version of existing file)</p> <pre><code>>svn merge --dry-run file:///Z:/Repo/branches/B2 --- Merging r4 through r9 into '.': C src\add.txt G . Summary of conflicts: Tree conflicts: 1 </code></pre>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload