Re:GitFlow considered harmful
by Mithaldu on Friday June 19, 2015 @11:04AM
(#9745240)
Edit: There's a well-written solution for that here: https://news.ycombinator.com/item?id=9745367
[ Parent
| on HN ]
Parent was deleted.
Ugh dammit. Short version:
Instead of taking the branch <feature> and rebasing it, make a branch called <feature>.1 on top of <feature>, then rebase that, leaving <feature> in place.
That way all your references remain intact and you can compare CI results.
Increment the number as needed.
It solves the issue of the CI references. But it also seems a bit clumsy to me.
It's all trade-offs. The trade-off being that you maintain history by having copies of a branch around, while the dude trying to fix a bug doesn't have to break out the vodka bottle upon arriving back home. :)