diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-30 10:43:09 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-30 10:43:09 +0100 |
| commit | 85f6244ce852fb6b788ea660c7d0cbe14ec10a20 (patch) | |
| tree | ec29f6c01ea8e4ac774f3dae874a3a3abf97267b /doc/gitlab-basics/start-using-git.md | |
| parent | 2bee8e7db927d2bc2c5912b98dfe52d3c3c40fbd (diff) | |
| parent | 2778dec131c2afac9fcdb2c42365b69099a5ae5b (diff) | |
| download | gitlab-ce-85f6244ce852fb6b788ea660c7d0cbe14ec10a20.tar.gz | |
Merge branch 'master' into build-cancel-spinner
Diffstat (limited to 'doc/gitlab-basics/start-using-git.md')
| -rw-r--r-- | doc/gitlab-basics/start-using-git.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md index 89ce8bcc3e8..b61f436c1a4 100644 --- a/doc/gitlab-basics/start-using-git.md +++ b/doc/gitlab-basics/start-using-git.md @@ -120,3 +120,11 @@ You need to be in the created branch. git checkout NAME-OF-BRANCH git merge master ``` + +### Merge master branch with created branch +You need to be in the master branch. +``` +git checkout master +git merge NAME-OF-BRANCH +``` + |