From 791dbf57972909b11346ab23d8497494fd4518ac Mon Sep 17 00:00:00 2001
From: jlamothe <jlamothe@9p>
Date: Fri, 17 Nov 2023 18:28:12 +0000
Subject: [PATCH] added README.md

---
 README.md | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..0383b23
--- /dev/null
+++ b/README.md
@@ -0,0 +1,35 @@
+I made this repository to illustrate some issues I've been having with
+Plan9's git implementation.
+
+# Rebase Problem
+
+Switch to branch b with:
+
+```
+git/branch b
+```
+
+Try to rebase it on top of branch a with:
+
+```
+git/rebase a
+```
+
+Notice that branch now points to the same commit as branch a.  The
+last commit from branch b seems to have ceased to exist.
+
+# Merge Problem
+
+Switch to branch c with:
+
+```
+git/branch c
+```
+
+Try to merge in branch a with:
+
+```
+git/merge a
+```
+
+Notice that this should have resulted in a merge conflict, but didn't.