silly readme

2020-11-25 22:23:39 -08:00 · 2020-11-25 22:23:39 -08:00 · 1ac8ae2359
commit 1ac8ae2359
parent f92cfe6c1f
6 changed files with 23 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -0,0 +1,23 @@
+# Has this ever happened to you?
+
+### You're working on some feature with progress that's out for review
+
+![](docs/work1.png)
+
+### And the review gets accepted and squash-merged! Hooray!
+
+![](docs/work2.png)
+
+### Now you want to `git rebase` your latest work so it can be reviewed...
+
+![](docs/work3.png)
+
+### ...but of course this happens!
+
+![](docs/conflict.png)
+
+### What you really wanted is this:
+
+![](docs/work4.png)
+
+# There must be a better way
--- a/docs/conflict.png
+++ b/docs/conflict.png
--- a/docs/work1.png
+++ b/docs/work1.png
--- a/docs/work2.png
+++ b/docs/work2.png
--- a/docs/work3.png
+++ b/docs/work3.png
--- a/docs/work4.png
+++ b/docs/work4.png