Skip to content

Commit

Permalink
removed develop feature branch name and heading
Browse files Browse the repository at this point in the history
  • Loading branch information
Tweniee committed Nov 22, 2023
1 parent 824822a commit d565c39
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions docs/howtos/rebasing_a_pull_request.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Rebasing a Pull Request

On certain occasions, it might be necessary to redirect a pull request from the develop branch to the latest release branch, such as `release-v*` (e.g., `release-v0.16.x` when working on version 0.16), or vice versa. This guide outlines the steps for rebasing a feature branch related to your pull request while maintaining a clean commit history.

The demonstration centers on the process of rebasing a feature branch that is directed towards the `develop` branch in your pull request, transitioning it to the most recent release branch, identified as `release-v*`. If the need arises to rebase your pull request in the opposite direction—from `release-v*` to `develop` you can follow the same steps, just adjusting the branch names as indicated in the guide below.
Expand All @@ -8,12 +6,7 @@ The demonstration centers on the process of rebasing a feature branch that is di
- Make sure you have local versions of the `develop` branch and the `release-v*` branch.
- Ensure that both branches are up to date. For this guide, we'll assume they are named `develop` and `release-v*`, respectively.

Locally, checkout your feature branch:
```
git checkout develop
```

And run the following rebase command:
Locally, checkout your feature branch and run the following rebase command:

```
git rebase --onto release-v* develop
Expand Down

0 comments on commit d565c39

Please sign in to comment.