diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /doc/user/project/merge_requests/revert_changes.md | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'doc/user/project/merge_requests/revert_changes.md')
-rw-r--r-- | doc/user/project/merge_requests/revert_changes.md | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/doc/user/project/merge_requests/revert_changes.md b/doc/user/project/merge_requests/revert_changes.md index d5d0578c07c..a798f2c9b85 100644 --- a/doc/user/project/merge_requests/revert_changes.md +++ b/doc/user/project/merge_requests/revert_changes.md @@ -1,6 +1,6 @@ --- stage: Create -group: Source Code +group: Code Review info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments type: reference, concepts --- @@ -13,27 +13,26 @@ by clicking the **Revert** button in merge requests and commit details. ## Reverting a merge request NOTE: -The **Revert** button will only be available for merge requests +The **Revert** button is available only for merge requests created in GitLab 8.5 and later. However, you can still revert a merge request by reverting the merge commit from the list of Commits page. NOTE: -The **Revert** button will only be shown for projects that use the +The **Revert** button is shown only for projects that use the merge method "Merge Commit", which can be set under the project's **Settings > General > Merge request**. [Fast-forward commits](fast_forward_merge.md) -can not be reverted via the MR view. +can not be reverted by using the merge request view. -After the Merge Request has been merged, a **Revert** button will be available +After the merge request has been merged, use the **Revert** button to revert the changes introduced by that merge request. -![Revert Merge Request](img/cherry_pick_changes_mr.png) +![Revert merge request](img/cherry_pick_changes_mr.png) -After you click that button, a modal will appear where you can choose to +After you click that button, a modal appears where you can choose to revert the changes directly into the selected branch or you can opt to create a new merge request with the revert changes. -After the merge request has been reverted, the **Revert** button will not be -available anymore. +After the merge request has been reverted, the **Revert** button is no longer available. ## Reverting a commit @@ -45,14 +44,13 @@ Similar to reverting a merge request, you can opt to revert the changes directly into the target branch or create a new merge request to revert the changes. -After the commit has been reverted, the **Revert** button will not be available -anymore. +After a commit is reverted, the **Revert** button is no longer available. -Please note that when reverting merge commits, the mainline will always be the -first parent. If you want to use a different mainline then you need to do that +When reverting merge commits, the mainline is always the +first parent. If you want to use a different mainline, you need to do that from the command line. -Here is a quick example to revert a merge commit using the second parent as the +Here's an example to revert a merge commit using the second parent as the mainline: ```shell |