Menu
In my repository I have a branch called aq which I'm working on.
I then committed new work and bugs in master.
What is the best way to get those commits into the aq branch? Create another new branch out of master and merge it with aq?
764
git merge updates the current branch with the corresponding remote tracking branch. Using git pull , you get both parts of these updates. But, this means that if you are checked out to feature branch and you execute git pull , when you checkout to master , any new updates will not be included.
Check out the aq branch, and rebase from master.
git checkout aq git rebase 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
