3 ms·
I see. But as you noted, one must do CI tests again after a rebase.
by solutionyogi 11y ago
I see. But as you noted, one must do CI tests again after a rebase.
- sytse 11y agoIndeed you need to do them again. But you also have to rerun them after a merge anyway. The problem is that you can no longer see which commits that you merged where green before the merge. For example is very useful if the merge itself breaks the tests (uncommon but it can happen).
- Mithaldu 11y agoEdit: There's a well-written solution for that here: https://news.ycombinator.com/item?id=9745367 https://news.ycombinator.com/item?id=9745367
- sytse 11y agoParent was deleted.
- Mithaldu 11y agoUgh 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.
- sytse 11y agoIt solves the issue of the CI references. But it also seems a bit clumsy to me.
- Mithaldu 11y agoIt'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. :)