blog

commit

e45992eadf93ad47257e963df33d44d6533ba1ae

parent

5a95a78a8e733ab76417fbaa0d81de2506236331

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2024-07-02 17:38

typos

Diffstat

1 files changed, 4 insertions, 4 deletions

diff --git a/_content/posts/2014-09-09-patch-theory/index.md b/_content/posts/2014-09-09-patch-theory/index.md

@@ -110,7 +110,7 @@ based patches, this is only possible if `AC` does not touch any of the
  110   110 lines that `CD` changes. And because in the end, both paths arrive at
  111   111 `D`, this must mean that `AC` and `CD` are equivalent.
  112   112 
  113    -1 ### Corolarries
   -1   113 ### Corollaries
  114   114 
  115   115 -   For 1, 2 and 4 there is actually equivalence
  116   116 
@@ -181,7 +181,7 @@ on in the future.
  181   181 ### Simple Questions
  182   182 
  183   183 There are some questions about patches that seem harmless but are not
  184    -1 all that easy to get an anser for. Examples:
   -1   184 all that easy to get an answer for. Examples:
  185   185 
  186   186 -   Is there a patch `a` with `dom(a) = S` except for `id`?
  187   187 
@@ -228,7 +228,7 @@ get a whole lot nicer if we could manage to extend `P` to contain one or
  228   228 many elements that represent conflict. I did not come up with a sensible
  229   229 way to force `P` into a group, but I guess it would be worth it.
  230   230 
  231    -1 #### Manual conflict resultion
   -1   231 #### Manual conflict resolution
  232   232 
  233   233 An issue that I imagine is very important in developing actual version
  234   234 control systems is aiding humans in resolving conflicts. I did only
@@ -246,7 +246,7 @@ I did not yet think about it at all.
  246   246 
  247   247 I believe I have come up with a stable foundation for patch theory. The
  248   248 idea to define patches as equivalence classes over the square of states
  249    -1 proved to be flexible and elegant. I have anylized patches to have a
   -1   249 proved to be flexible and elegant. I have analyzed patches to have a
  250   250 group-like structure, but did not yet manage to force them into actually
  251   251 being a group.
  252   252