72 lines
2.8 KiB
Markdown
72 lines
2.8 KiB
Markdown
---
|
|
stage: Create
|
|
group: Source Code
|
|
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/#designated-technical-writers
|
|
type: reference, concepts
|
|
---
|
|
|
|
# Reverting changes
|
|
|
|
You can use Git's powerful feature to [revert any commit](https://git-scm.com/docs/git-revert "Git revert documentation")
|
|
by clicking the **Revert** button in merge requests and commit details.
|
|
|
|
## Reverting a merge request
|
|
|
|
NOTE: **Note:**
|
|
The **Revert** button will only be available 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: **Note:**
|
|
The **Revert** button will only be shown 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.
|
|
|
|
After the Merge Request has been merged, a **Revert** button will be available
|
|
to revert the changes introduced by that merge request.
|
|
|
|
![Revert Merge Request](img/cherry_pick_changes_mr.png)
|
|
|
|
After you click that button, a modal will appear 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.
|
|
|
|
## Reverting a commit
|
|
|
|
You can revert a commit from the commit details page:
|
|
|
|
![Revert commit](img/cherry_pick_changes_commit.png)
|
|
|
|
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.
|
|
|
|
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
|
|
from the command line.
|
|
|
|
Here is a quick example to revert a merge commit using the second parent as the
|
|
mainline:
|
|
|
|
```shell
|
|
git revert -m 2 7a39eb0
|
|
```
|
|
|
|
<!-- ## Troubleshooting
|
|
|
|
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
|
|
one might have when setting this up, or when something is changed, or on upgrading, it's
|
|
important to describe those, too. Think of things that may go wrong and include them here.
|
|
This is important to minimize requests for support, and to avoid doc comments with
|
|
questions that you know someone might ask.
|
|
|
|
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
|
|
If you have none to add when creating a doc, leave this section in place
|
|
but commented out to help encourage others to add to it in the future. -->
|