Commit 9b151730 authored by Kati Paizee's avatar Kati Paizee

Merge branch '338683-msj-git-merge-fix' into 'master'

Reorder git commands correctly

See merge request gitlab-org/gitlab!68355
parents 064e9079 aeeafb29
...@@ -450,11 +450,11 @@ You can learn more about the different ways Git can undo changes in the ...@@ -450,11 +450,11 @@ You can learn more about the different ways Git can undo changes in the
### Merge a branch with default branch ### Merge a branch with default branch
When you are ready to add your changes to When you are ready to add your changes to
the default branch, you `merge` the two together: the default branch, you merge the feature branch into it:
```shell ```shell
git checkout <feature-branch> git checkout <default-branch>
git merge <default-branch> git merge <feature-branch>
``` ```
In GitLab, you typically use a [merge request](../user/project/merge_requests/) to merge your changes, instead of using the command line. In GitLab, you typically use a [merge request](../user/project/merge_requests/) to merge your changes, instead of using the command line.
......
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