Get changes from master into branch in Git

2018-06-17 07:26:42

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 ?

检查aq分支，并从master分配。

git checkout aq
git rebase master

当你在你的aq分支上时，你应该能够将git merge origin/master 。

git checkout aq
git merge origin/master

First check out to master:

git checkout master

Do all changes, hotfix and commits and push your master.

Go back to your branch, 'aq', and merge master in it:

git checkout aq
git merge master

Your branch will be up-to-date with master. A good and basic example of merge is 3.2 Git Branching - Basic Branching and Merging.

链接地址: http://www.djcxy.com/p/48936.html