diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-02 18:09:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-02 18:09:20 +0000 |
| commit | fee10148072e2e96d14034f099985a441a844c6e (patch) | |
| tree | 64ed9aa910ed10df0f06a0b010f221443baec8bc /doc/topics | |
| parent | 02c151e384fe058fa070d50c6df94898385ff09c (diff) | |
| download | gitlab-ce-fee10148072e2e96d14034f099985a441a844c6e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/git/feature_branch_development.md | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/doc/topics/git/feature_branch_development.md b/doc/topics/git/feature_branch_development.md index 5f4b5632f33..8d18441aadd 100644 --- a/doc/topics/git/feature_branch_development.md +++ b/doc/topics/git/feature_branch_development.md @@ -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`. |