https://wiki.animationmaster.com/index.php?action=history&feed=atom&title=Diff%2FMergeDiff/Merge - Revision history2026-04-30T06:54:38ZRevision history for this page on the wikiMediaWiki 1.32.0https://wiki.animationmaster.com/index.php?title=Diff/Merge&diff=369&oldid=prevWillP at 20:06, 13 February 20072007-02-13T20:06:13Z<p></p>
<table class="diff diff-contentalign-left" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #222; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #222; text-align: center;">Revision as of 20:06, 13 February 2007</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l22" >Line 22:</td>
<td colspan="2" class="diff-lineno">Line 22:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>[[category:TWO]]</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>[[category:TWO]]</div></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>[[<del class="diffchange diffchange-inline">cateogry</del>:SVN]]</div></td><td class='diff-marker'>+</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>[[<ins class="diffchange diffchange-inline">category</ins>:SVN]]</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>[[category:Help]]</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>[[category:Help]]</div></td></tr>
</table>WillPhttps://wiki.animationmaster.com/index.php?title=Diff/Merge&diff=368&oldid=prevWillP at 20:05, 13 February 20072007-02-13T20:05:40Z<p></p>
<table class="diff diff-contentalign-left" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="en">
<td colspan="2" style="background-color: #fff; color: #222; text-align: center;">← Older revision</td>
<td colspan="2" style="background-color: #fff; color: #222; text-align: center;">Revision as of 20:05, 13 February 2007</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>
<td colspan="2" class="diff-lineno">Line 1:</td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;"></del></div></td><td colspan="2"> </td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>If you are using TortoiseSVN on the PC with [[SVN]] then see its help file on conflicts.</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>If you are using TortoiseSVN on the PC with [[SVN]] then see its help file on conflicts.</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l10" >Line 10:</td>
<td colspan="2" class="diff-lineno">Line 9:</td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>To before you can mark the file.ext’s conflict resolved you need to merge .rx+1 and .mine into file.ext</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>To before you can mark the file.ext’s conflict resolved you need to merge .rx+1 and .mine into file.ext</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'>−</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div>You can fix file.ext with a text editor by searching for “<<<<<<<” see [[Svn <del class="diffchange diffchange-inline">Conflicts</del>]].<br />But the best way is to use <del class="diffchange diffchange-inline">tortois’s </del>“Edit Conflicts” option if you are on the PC or…<del class="diffchange diffchange-inline"><br /></del>If you are on <span class="caps">OSX</span> or are not using tortoise you’ll need a tool like [http://kdiff3.sourceforge.net/ KDiff3]</div></td><td class='diff-marker'>+</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>You can fix file.ext with a text editor by searching for “<<<<<<<” see [[Svn <ins class="diffchange diffchange-inline">Conflict</ins>]].<br />But the best way is to use <ins class="diffchange diffchange-inline">Tortoise’s </ins>“Edit Conflicts” option if you are on the PC or…</div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div> </div></td></tr>
<tr><td colspan="2"> </td><td class='diff-marker'>+</td><td style="color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div>If you are on <span class="caps">OSX</span> or are not using tortoise you’ll need a tool like [http://kdiff3.sourceforge.net/ KDiff3]</div></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"></td></tr>
<tr><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>'''KDiff3'''</div></td><td class='diff-marker'> </td><td style="background-color: #f8f9fa; color: #222; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>'''KDiff3'''</div></td></tr>
</table>WillPhttps://wiki.animationmaster.com/index.php?title=Diff/Merge&diff=367&oldid=prevWillP: New page: If you are using TortoiseSVN on the PC with SVN then see its help file on conflicts. When an <span class="caps">SVN</span> conflict occurs there are three temp files created * file...2007-02-13T20:04:04Z<p>New page: If you are using TortoiseSVN on the PC with <a href="/index.php?title=SVN" title="SVN">SVN</a> then see its help file on conflicts. When an <span class="caps">SVN</span> conflict occurs there are three temp files created * file...</p>
<p><b>New page</b></p><div><br />
If you are using TortoiseSVN on the PC with [[SVN]] then see its help file on conflicts.<br />
<br />
When an <span class="caps">SVN</span> conflict occurs there are three temp files created<br />
<br />
* file.ext.rx<br />(origional file)<br />
* file.ext.rx+1<br />(recived file)<br />
* file.ext.mine<br />(your file)<br />file.ext has file.ext.rx+1 and file.ext.mine merged as well as it can with conflicts marked with <<<<<<<<br />
<br />
To before you can mark the file.ext’s conflict resolved you need to merge .rx+1 and .mine into file.ext<br />
<br />
You can fix file.ext with a text editor by searching for “<<<<<<<” see [[Svn Conflicts]].<br />But the best way is to use tortois’s “Edit Conflicts” option if you are on the PC or…<br />If you are on <span class="caps">OSX</span> or are not using tortoise you’ll need a tool like [http://kdiff3.sourceforge.net/ KDiff3]<br />
<br />
'''KDiff3'''<br />
<br />
file.ext.rx should be file A<br />
<br />
file.ext.rx+1 should be file B<br />
<br />
file.ext.mine should be file C<br />
<br />
[[category:TWO]]<br />
[[cateogry:SVN]]<br />
[[category:Help]]</div>WillP