Menu
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.
Merge your "dev" branch into the "master". git checkout dev # switch to "dev" branch if you're not already. git merge master # optionally, this command is being used to resolve any conflicts if you pushed any changes to your "master" but "dev" doesn't have that commit.
git checkout custom_branch && git rebase master
This will update custom_branch with changes from master branch.
Don't forget to make sure master is up to date first. git pull
This is also possible with git checkout custom_branch && git merge master
Answering my own question but to pull changes from upstream's master into my custom branch I did this:
git pull [URL TO UPSTREAM'S REPO] master
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.
I think this is what you are looking for: git merge 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