makyo
/
zk
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:04 -07:00
parent a85f9660fa
commit f275797d51
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
writing/post-self/fate.md
View File

@ -55,31 +55,39 @@ The further away from an instance is from another, whether in time or in forks,
Consider the following: Consider the following:
a -+- - - -X ```text
\ / a -+- - - -X
a' -/ \ /
a' -/
```
Merge `X` is simple. Merge `X` is simple.
a -+- - - - - - -X ```text
\ / a -+- - - - - - -X
a' - - - -/ \ /
a' - - - -/
```
Merge `X` becomes more difficult with conflicts. Merge `X` becomes more difficult with conflicts.
a -+- - - - - -X- -Y ```text
\ / / a -+- - - - - -X- -Y
a' -+- -/ / \ / /
\ / a' -+- -/ /
a''-/ \ /
a''-/
```
Merge `Y` gains conflicts due to split experiences and time. Merge `X` less so, but still more conflicts than merge `X` in the first example, due to time. Merge `Y` gains conflicts due to split experiences and time. Merge `X` less so, but still more conflicts than merge `X` in the first example, due to time.
a - - - - -X- - -? ```text
\ / / a - - - - -X- - -?
a' - / \ / /
/ a' - /
b - - - - - -/ /
b - - - - - -/
```
Merge `?` is impossible with the current state of technology. The two instances have no shared past instances on which to build a reasonable diff. Merge `?` is impossible with the current state of technology. The two instances have no shared past instances on which to build a reasonable diff.