Commit dd2f3a7c authored by Nick Gaskill's avatar Nick Gaskill

Merge branch 'mjang-fix-rp-branch-use-case' into 'master'

Fix doc for working from feature branches

See merge request gitlab-org/gitlab!39909
parents b8f3db41 5816c0a9
......@@ -23,10 +23,29 @@ In such cases, it may be more efficient to submit an MR on the release post feat
In this case, the feature branch would be `release-X-Y`. Assuming the `release-X-Y` branch already exists, you can set up an MR against that branch, with the following steps:
1. Create a new branch (`test-branch`) against the feature branch (`release-X-Y`):
1. Navigate to the main (master) branch:
```shell
git checkout -b test-branch release-X-Y
git checkout master
```
1. Make sure you have the latest version of your repository:
```shell
git fetch
git pull
```
1. Check out the feature branch:
```shell
git checkout release-x-y
```
1. Create a new branch (`test-branch`) against the feature branch (`release-x-y`):
```shell
git checkout -b test-branch release-x-y
```
You should now be on a branch named `test-branch`.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment