From f275797d511cfe9988e7353f529297187f95fe18 Mon Sep 17 00:00:00 2001 From: Madison Scott-Clary Date: Sun, 26 Apr 2020 15:30:04 -0700 Subject: [PATCH] update from sparkleup --- writing/post-self/fate.md | 40 +++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/writing/post-self/fate.md b/writing/post-self/fate.md index b46f7025..c5fe4344 100644 --- a/writing/post-self/fate.md +++ b/writing/post-self/fate.md @@ -55,31 +55,39 @@ The further away from an instance is from another, whether in time or in forks, Consider the following: - a -+- - - -X - \ / - a' -/ +```text +a -+- - - -X + \ / + a' -/ +``` Merge `X` is simple. - a -+- - - - - - -X - \ / - a' - - - -/ +```text +a -+- - - - - - -X + \ / + a' - - - -/ +``` Merge `X` becomes more difficult with conflicts. - a -+- - - - - -X- -Y - \ / / - a' -+- -/ / - \ / - a''-/ +```text +a -+- - - - - -X- -Y + \ / / + 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. - a - - - - -X- - -? - \ / / - a' - / - / - b - - - - - -/ +```text +a - - - - -X- - -? + \ / / + a' - / + / +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.