diff --git a/README.md b/README.md new file mode 100644 index 0000000..5c739a7 --- /dev/null +++ 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 diff --git a/docs/conflict.png b/docs/conflict.png new file mode 100644 index 0000000..3cda4a0 Binary files /dev/null and b/docs/conflict.png differ diff --git a/docs/work1.png b/docs/work1.png new file mode 100644 index 0000000..e91ed25 Binary files /dev/null and b/docs/work1.png differ diff --git a/docs/work2.png b/docs/work2.png new file mode 100644 index 0000000..543edc2 Binary files /dev/null and b/docs/work2.png differ diff --git a/docs/work3.png b/docs/work3.png new file mode 100644 index 0000000..69d4e91 Binary files /dev/null and b/docs/work3.png differ diff --git a/docs/work4.png b/docs/work4.png new file mode 100644 index 0000000..501621c Binary files /dev/null and b/docs/work4.png differ