Mees Frenkel Frank Mees Frenkel Frank - 17 days ago 6
Git Question

Merging develop branch into master

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

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