合并开发分支到主

Question

我有2个分支本地回购master和develop.

• 在develop分支我有我的所有Drupal 8核心代码
• 在我的master分支我有1提交(初始提交)

在我的远程仓库中,我将所有Drupal 8核心代码放在分支中develop.如何在远程主分支中获取此代码？我如何合并这些回购？

更新:

当我这样做时,git status我得到:

On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
  (use "git add <file>..." to include in what will be committed)

    griffioenrotterdam.sublime-project
    griffioenrotterdam.sublime-workspace
    sites/

nothing added to commit but untracked files present (use "git add" to track)

我需要做什么？

更新2:

当我这样做时,git checkout develop我得到:

error: The following untracked working tree files would be overwritten by checkout:
    sites/default/default.services.yml
    sites/default/default.settings.php
Please move or remove them before you can switch branches.
Aborting

我需要做什么？

Answer 1

简介:您需要切换到您的开发分支,从远程仓库中提取代码,然后将其合并到master(本地)并将其推回到远程仓库(进入主分支)

git checkout develop
git pull origin develop
git checkout master
git merge develop
git push origin master

Answer 2

合并到本地，发展为主人，然后推动

git checkout master
git merge develop
git push