git-changeid-evolve/README.md
2020-11-25 22:23:39 -08:00

23 lines
453 B
Markdown

# 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