barak/git-changeid-evolve
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

silly readme

Browse source
This commit is contained in:
Barak Michener 2020-11-25 22:23:39 -08:00
parent f92cfe6c1f
commit 1ac8ae2359
6 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
README.md Normal file
View file

@ -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