Skip to content

Instantly share code, notes, and snippets.

@ananthakumaran
Created July 10, 2019 12:58
Show Gist options
  • Save ananthakumaran/1b90198ab3a93f96acf6b4e421322b77 to your computer and use it in GitHub Desktop.
Save ananthakumaran/1b90198ab3a93f96acf6b4e421322b77 to your computer and use it in GitHub Desktop.

Gitlab Merge Assistant

Gitlab provides a feature called semi-linear history merge requests which only allows fast forward merge. This ensures the target branch is always green.

If you have a mono repo or a repo with lot of committers, merging a reviewed MR into master branch can get tedious. As only one MR can be merged at a time and all the pending MRs will be invalidated after the merge has to be rebased and tested again.

Assistant tries to automate the flow. Once the MR is reviewed, the Reviewed label should be added by the reviewer. Assistant will rebase and merge the reviewed MRs one by one.

Note: Gitlab has another feature called Merge Trains which solves the same issue. You should use that if you have enterprise subscription.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment