summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bracht Laumann Jespersen <t@laumann.xyz>2022-09-27 14:35:07 +0200
committerThomas Bracht Laumann Jespersen <t@laumann.xyz>2022-09-27 14:35:07 +0200
commitfe9adaef71db22b43caf2d5cc69a1177a706b7d4 (patch)
treebd73d7d7d99d650e2ffa0026690988db5c705ba1
parentdae7ab43fa7b26c30de8547c0871132e10365003 (diff)
site: move goodbadmerge into ani
-rw-r--r--site/ani/goodbadmerge.md (renamed from site/goodbadmerge.md)10
1 files changed, 7 insertions, 3 deletions
diff --git a/site/goodbadmerge.md b/site/ani/goodbadmerge.md
index 9012fcd..b5f1d10 100644
--- a/site/goodbadmerge.md
+++ b/site/ani/goodbadmerge.md
@@ -1,9 +1,13 @@
# Good merge, bad merge
+Posted on <b><time id="post-date">2022-08-04</time></b>.
+
+<p id="post-excerpt">
Some time ago, I got excited about a new <acronym title="version control
-system">VCS</acronym> called [Pijul] whose distinctive feature is that it's
-based on a theoretical foundation around
-patches ([paper][catpatches]).
+system">VCS</acronym> called <a href="https://pijul.org/">Pijul</a> whose
+distinctive feature is that it's based on a theoretical foundation around
+patches (<a href="https://arxiv.org/abs/1311.3903">paper</a>).
+</p>
I tried to read the paper at the time and failed miserably. I have extremely
limited knowledge of category theory.