makyo
/
zk_html
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update from sparkleup

This commit is contained in:
Madison Scott-Clary 2020-04-26 15:30:08 -07:00
parent c20ef598a8
commit f109bc0da3
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
writing/post-self/fate.html
View File

@ -115,34 +115,34 @@
<h3 id="conflicts">Conflicts</h3> <h3 id="conflicts">Conflicts</h3>
<p>The further away from an instance is from another, whether in time or in forks, the more likely conflicts are, and the harder any merge becomes. Instances of separate individuals are, of course, so different as to be impossible to merge (though some are working on this).</p> <p>The further away from an instance is from another, whether in time or in forks, the more likely conflicts are, and the harder any merge becomes. Instances of separate individuals are, of course, so different as to be impossible to merge (though some are working on this).</p>
<p>Consider the following:</p> <p>Consider the following:</p>
<div class="codehilite"><pre><span></span><code><span class="err">a -+- - - -X</span> <div class="codehilite"><pre><span></span><code>a -+- - - -X
<span class="err"> \ /</span> \ /
<span class="err"> a&#39; -/</span> a&#39; -/
</code></pre></div> </code></pre></div>
<p>Merge <code>X</code> is simple.</p> <p>Merge <code>X</code> is simple.</p>
<div class="codehilite"><pre><span></span><code><span class="err">a -+- - - - - - -X</span> <div class="codehilite"><pre><span></span><code>a -+- - - - - - -X
<span class="err"> \ /</span> \ /
<span class="err"> a&#39; - - - -/</span> a&#39; - - - -/
</code></pre></div> </code></pre></div>
<p>Merge <code>X</code> becomes more difficult with conflicts.</p> <p>Merge <code>X</code> becomes more difficult with conflicts.</p>
<div class="codehilite"><pre><span></span><code><span class="err">a -+- - - - - -X- -Y</span> <div class="codehilite"><pre><span></span><code>a -+- - - - - -X- -Y
<span class="err"> \ / /</span> \ / /
<span class="err"> a&#39; -+- -/ /</span> a&#39; -+- -/ /
<span class="err"> \ /</span> \ /
<span class="err"> a&#39;&#39;-/</span> a&#39;&#39;-/
</code></pre></div> </code></pre></div>
<p>Merge <code>Y</code> gains conflicts due to split experiences and time. Merge <code>X</code> less so, but still more conflicts than merge <code>X</code> in the first example, due to time.</p> <p>Merge <code>Y</code> gains conflicts due to split experiences and time. Merge <code>X</code> less so, but still more conflicts than merge <code>X</code> in the first example, due to time.</p>
<div class="codehilite"><pre><span></span><code><span class="err">a - - - - -X- - -?</span> <div class="codehilite"><pre><span></span><code>a - - - - -X- - -?
<span class="err"> \ / /</span> \ / /
<span class="err"> a&#39; - /</span> a&#39; - /
<span class="err"> /</span> /
<span class="err">b - - - - - -/</span> b - - - - - -/
</code></pre></div> </code></pre></div>