undefined | Better HN

0 pointssytse10y ago0 comments

My 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

0 comments

solutionyogi10y ago

Could you expand on what do you mean by rebase breaking CI tests? I don't see how that's possible.

plorkyeran10y ago

The 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.

tehbeard10y ago

Since 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?

solutionyogi10y ago

I see. But as you noted, one must do CI tests again after a rebase.

1 more reply

tokenizerrr10y ago

A 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.

j / k navigate · click thread line to collapse

0 pointssytse10y ago0 comments

0 comments

solutionyogi10y ago

Could you expand on what do you mean by rebase breaking CI tests? I don't see how that's possible.

plorkyeran10y ago

The 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.

tehbeard10y ago

Since 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?

solutionyogi10y ago

I see. But as you noted, one must do CI tests again after a rebase.

1 more reply

tokenizerrr10y ago

A 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.

j / k navigate · click thread line to collapse