Whenever you need to merge one branch into another branch with GitLab, you
Merge requests (MRs) are the way you check source code changes into a branch.
must create a merge request (MR).
Using merge requests, you can visualize and collaborate on proposed changes to
When you open a merge request, you can visualize and collaborate on the code changes before merge.
source code. Merge requests display information about the proposed code changes,
Merge requests include:
including:
- A description of the request.
- A description of the request.
- Code changes and inline code reviews.
- Code changes and inline code reviews.
...
@@ -20,55 +18,50 @@ including:
...
@@ -20,55 +18,50 @@ including:
- A comment section for discussion threads.
- A comment section for discussion threads.
- The list of commits.
- The list of commits.
Based on your workflow, after review you can merge a merge request into its
target branch.
To get started, read the [introduction to merge requests](getting_started.md).
To get started, read the [introduction to merge requests](getting_started.md).
## Use cases
## Merge request workflows
A. Consider you're a software developer working in a team:
For a software developer working in a team:
1. You checkout a new branch, and submit your changes through a merge request
1. You checkout a new branch, and submit your changes through a merge request.
1. You gather feedback from your team
1. You gather feedback from your team.
1. You work on the implementation optimizing code with [Code Quality reports](code_quality.md)
1. You work on the implementation optimizing code with [Code Quality reports](code_quality.md).
1. You verify your changes with [Unit test reports](../../../ci/unit_test_reports.md) in GitLab CI/CD
1. You verify your changes with [Unit test reports](../../../ci/unit_test_reports.md) in GitLab CI/CD.
1. You avoid using dependencies whose license is not compatible with your project with [License Compliance reports](../../compliance/license_compliance/index.md)**(ULTIMATE)**
1. You avoid using dependencies whose license is not compatible with your project with [License Compliance reports](../../compliance/license_compliance/index.md).
1. You request the [approval](merge_request_approvals.md) from your manager**(STARTER)**
1. You request the [approval](merge_request_approvals.md) from your manager.
1. Your manager:
1. Your manager:
1. Pushes a commit with their final review
1. Pushes a commit with their final review.
1.[Approves the merge request](merge_request_approvals.md)**(STARTER)**
1.[Approves the merge request](merge_request_approvals.md).
1. Sets it to [merge when pipeline succeeds](merge_when_pipeline_succeeds.md)
1. Sets it to [merge when pipeline succeeds](merge_when_pipeline_succeeds.md).
1. Your changes get deployed to production with [manual actions](../../../ci/yaml/README.md#whenmanual) for GitLab CI/CD
1. Your changes get deployed to production with [manual actions](../../../ci/yaml/README.md#whenmanual) for GitLab CI/CD.
1. Your implementations were successfully shipped to your customer
1. Your implementations were successfully shipped to your customer.
B. Consider you're a web developer writing a webpage for your company's website:
For a web developer writing a webpage for your company's website:
1. You checkout a new branch, and submit a new page through a merge request
1. You checkout a new branch and submit a new page through a merge request.
1. You gather feedback from your reviewers
1. You gather feedback from your reviewers.
1. Your changes are previewed with [Review Apps](../../../ci/review_apps/index.md)
1. You preview your changes with [Review Apps](../../../ci/review_apps/index.md).
1. You request your web designers for their implementation
1. You request your web designers for their implementation.
1. You request the [approval](merge_request_approvals.md) from your manager**(STARTER)**
1. You request the [approval](merge_request_approvals.md) from your manager.
1. Once approved, your merge request is [squashed and merged](squash_and_merge.md), and [deployed to staging with GitLab Pages](https://about.gitlab.com/blog/2021/02/05/ci-deployment-and-environments/)
1. Once approved, your merge request is [squashed and merged](squash_and_merge.md), and [deployed to staging with GitLab Pages](https://about.gitlab.com/blog/2021/02/05/ci-deployment-and-environments/).
1. Your production team [cherry picks](cherry_pick_changes.md) the merge commit into production
1. Your production team [cherry picks](cherry_pick_changes.md) the merge commit into production.
## Merge request navigation tabs at the top
## Merge request navigation tabs at the top
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/33813) in GitLab 12.6. This positioning is experimental.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/33813) in GitLab 12.6. This positioning is experimental.
So far, the navigation tabs present in merge requests to display **Discussion**,
In GitLab 12.5 and earlier, navigation tabs in merge requests (**Discussion**,
**Commits**, **Pipelines**, and **Changes** were located after the merge request
**Commits**, **Pipelines**, and **Changes**) were located after the merge request
widget.
widget.
To facilitate this navigation without having to scroll up and down through the page
To facilitate navigation without scrolling, and based on user feedback, the tabs are
to find these tabs, based on user feedback, we're experimenting with a new positioning
now located at the top of the merge request tab. A new **Overview** tab was added,
of these tabs. They are now located at the top of the merge request, with a new
and next to **Overview** are **Commits**, **Pipelines**, and **Changes**.
**Overview** tab, containing the description of the merge request followed by the
widget. Next to **Overview**, you can find **Pipelines**, **Commits**, and **Changes**.
