diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 15:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-17 15:08:42 +0300 |
| commit | b487021bd3f785d6348c13746fda6ce9043a99c5 (patch) | |
| tree | e75c483fae6089d597c9150a6e571ee17d589fe9 /doc/gitlab-basics | |
| parent | 0fd229655348c98448022fd293b42666b28eace5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/gitlab-basics')
| -rw-r--r-- | doc/gitlab-basics/start-using-git.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md index 9b26e1f102c..dfd1f09e297 100644 --- a/doc/gitlab-basics/start-using-git.md +++ b/doc/gitlab-basics/start-using-git.md @@ -450,11 +450,11 @@ You can learn more about the different ways Git can undo changes in the ### Merge a branch with default branch 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 -git checkout <feature-branch> -git merge <default-branch> +git checkout <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. |