Skip to content

Merge refs for CI builds

Description

We're using github with jenkins right now, due to us being a big open source project and quiet some PRs hitting master all the time, we would have to rebase everytime, if it weren't for the merge refs feature. One that gitlab is missing as far as I know.

There has been some work done here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12215 but I think it's not really getting as much attention as it should.

This should basically keep branches from needing a rebase, as long as git can resolve the conflict and merge on it's own.

github has refs/pull/<ID>/head and refs/pull/<ID>/merge gitlab only has head

Proposal

Add merge refs to gitlab

Links / references

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12215

Overview

What is it?

  • A new git ref

Why should someone use this feature?

  • It keeps contributors from having to rebase, for no reason

What is the underlying (business) problem?

  • Having to rebase all the time, due to many contributors

How do you use this feature?

  • You just specify it in your CI, maybe it needs to be the new default for "merge requests" in gitlab?

Use cases

Everybody who uses a CI and want's to safely skip rebasing.

Feature checklist

Make sure these are completed before closing the issue, with a link to the relevant commit.