debian-mirror-gitlab/doc/user/project/merge_requests/revert_changes.md

70 lines
2.5 KiB
Markdown
Raw Normal View History

2019-09-04 21:01:54 +05:30
---
type: reference, concepts
---
2016-09-29 09:46:39 +05:30
2019-09-04 21:01:54 +05:30
# Reverting changes
2016-09-29 09:46:39 +05:30
2019-09-04 21:01:54 +05:30
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.
2016-09-29 09:46:39 +05:30
2019-09-04 21:01:54 +05:30
## Reverting a merge request
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
NOTE: **Note:**
The **Revert** button will only be available for merge requests
created since GitLab 8.5. However, you can still revert a merge request
by reverting the merge commit from the list of Commits page.
2016-09-29 09:46:39 +05:30
2019-02-15 15:39:39 +05:30
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.
2016-09-29 09:46:39 +05:30
After the Merge Request has been merged, a **Revert** button will be available
2018-03-17 18:26:18 +05:30
to revert the changes introduced by that merge request.
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
![Revert Merge Request](img/cherry_pick_changes_mr.png)
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
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.
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
After the merge request has been reverted, the **Revert** button will not be
2016-09-29 09:46:39 +05:30
available anymore.
2019-09-04 21:01:54 +05:30
## Reverting a commit
2016-09-29 09:46:39 +05:30
2019-09-04 21:01:54 +05:30
You can revert a commit from the commit details page:
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
![Revert commit](img/cherry_pick_changes_commit.png)
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
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.
2016-09-29 09:46:39 +05:30
2018-03-17 18:26:18 +05:30
After the commit has been reverted, the **Revert** button will not be available
2016-09-29 09:46:39 +05:30
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:
2020-03-13 15:44:24 +05:30
```shell
2016-09-29 09:46:39 +05:30
git revert -m 2 7a39eb0
```
2019-09-04 21:01:54 +05:30
<!-- ## 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. -->