Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
aeeafb29
Commit
aeeafb29
authored
Aug 17, 2021
by
Marcin Sedlak-Jakubowski
Committed by
Kati Paizee
Aug 17, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reorder git commands correctly
parent
064e9079
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
doc/gitlab-basics/start-using-git.md
doc/gitlab-basics/start-using-git.md
+3
-3
No files found.
doc/gitlab-basics/start-using-git.md
View file @
aeeafb29
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment