From dc7805cd999dc6c97c407cbb419d1bb1cc36a71f Mon Sep 17 00:00:00 2001 From: Butch Anton Date: Thu, 21 Jul 2016 16:49:40 +0000 Subject: [PATCH] Update start-using-git.md --- doc/gitlab-basics/start-using-git.md | 8 ++++++++ 1 file changed, 8 insertions(+) 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 +``` +