Merging changes from master into my branch
I have two branches in git: master and custom_branch.
Somebody added some code to master that I need to use in my custom_branch. I tried this:
git branch custom_branch
git merge master
But when I do that, it says:
Already up-to-date.
But, when I compare master and custom_branch, the changes are still not there. What am I missing?
P.S. I don't want to rebase since other people also use this branch.
git branch custom_branch you don't change to custom_branch just staying on master. Execute git checkout custom_branch and if the master have some changes in master after you created the custom_branch then if you want to merge the changes to your custom_branch execute git merge master.
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
When do you use git rebase instead of git merge?
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 pull origin 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
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- How do I discard unstaged changes in Git?
- How can I selectively merge or pick changes from another branch in Git?
- Showing which files have changed between two revisions
- How do I check out a remote Git branch?
- How do I delete a Git branch locally and remotely?
- Make the current Git branch a master branch
- How to compare files from two different branches
- How do I safely merge a Git branch into master?
- How do I rename a local Git branch?
- Can I delete a git commit but keep the changes?
git pullbefore attempting to merge?