将开发分支合并到主分支

Question

I have a local repo with 2 branches master and develop .

• in develop branch I have all my Drupal 8 core code
• in my master branch I have 1 commit (Initial commit)

On my remote repo I have all my Drupal 8 core code in branch develop . How do I get this code in the remote master branch? How do I have to merge those repo's?

Update:

When I do git status I get:

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)

What do I have to do?

Update 2:

When I do git checkout develop I get:

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

What do I have to do?

Answer 1

Summary: you need to switch to your develop branch, pull the code from the remote repo, then merge it into master (locally) and push it back to remote repo (into master branch)

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

Answer 2

Merge locally develop into master and then push

git checkout master
git merge develop
git push

Answer 3

First commit your changes to master

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

Answer 4

我认为这个过程是使用 git pull request 从 dev(remote) 合并到 master(remote)。