3 ms·
There is nothing wrong with rebasing a feature branch imho. Feature branches should be considered ephemeral. But it probably depends on your team and project si
by brento 11y ago
There is nothing wrong with rebasing a feature branch imho. Feature branches should be considered ephemeral. But it probably depends on your team and project size.
- sytse 11y agoMy personal opinion is that it breaks history and CI tests for all the feature branches. But at GitLab we encountered customers that insisted on having a linear history after migrating from SVN. Therefore there is a function in the UI of GitLab EE to rebase a merge request when accepting the merge request. See http://doc.gitlab.com/ee/workflow/rebase_before_merge.html http://doc.gitlab.com/ee/workflow/rebase_before_merge.html
- solutionyogi 11y agoCould you expand on what do you mean by rebase breaking CI tests? I don't see how that's possible.
- tokenizerrr 11y agoA CI test result is tied to a particular commit hash. If you change this commit hash the CI test result will no longer be tied to that one commit.
- plorkyeran 11y agoThe results from previous CI runs are no longer connected to the rebased commits, and most people don't have CI set up to retest each commit individually after a rebase. I've never found this to be an actual problem in practice.
- tehbeard 11y agoSince a rebase changes the commit sha, I assume that's used as a reference for which version of the code the CI test was run against. That said, shouldn't CI be triggered after the rebase anyway to confirm all still works?
- solutionyogi 11y agoI 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.