title: Merging develop branch into master
body: <p>I have a local repo with 2 branches <code>master</code> and <code>develop</code>. </p>
  
  <ul>
  <li>in <code>develop</code> branch I have all my Drupal 8 core code</li>
  <li>in my <code>master</code> branch I have 1 commit (Initial commit)</li>
  </ul>
  
  <p>On my remote repo I have all my Drupal 8 core code in branch <code>develop</code>. How do I get this code in the remote master branch? How do I have to merge those repo's?</p>
  
  <p><strong>Update:</strong></p>
  
  <p>When I do <code>git status</code> I get:</p>
  
  <pre><code>On branch master
  Your branch is up-to-date with 'origin/master'.
  Untracked files:
    (use "git add &lt;file&gt;..." 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)
  </code></pre>
  
  <p>What do I have to do?</p>
  
  <p><strong>Update 2:</strong></p>
  
  <p>When I do <code>git checkout develop</code> I get:</p>
  
  <pre><code>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
  </code></pre>
  
  <p>What do I have to do?</p>