I have a local repo with 2 branches master
and develop
.
develop
branch I have all my Drupal 8 core codemaster
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?
First we run git checkout master to change the active branch back to the master branch. Then we run the command git merge new-branch to merge the new feature into the master branch. Note: git merge merges the specified branch into the currently active branch. So we need to be on the branch that we are merging into.
In GitHub Desktop, click Current Branch. Click Choose a branch to merge into BRANCH. Click the branch you want to merge into the current branch, then click Merge BRANCH into BRANCH. Note: If there are merge conflicts, GitHub Desktop will warn you above the Merge BRANCH into BRANCH button.
git merge master will update your current branch with the changes from your local master branch, the state of which will be that of when you last pulled while on that branch.
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
Merge locally develop into master and then push
git checkout master
git merge develop
git push
First commit your changes to master
git checkout develop
git pull origin develop
git checkout master
git merge develop
git push origin master
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With