Get changes from master into branch in Git

git version-control git-merge
Slee picture Slee · Mar 17, 2011 · Viewed 711.3k times · Source

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?

Answer

Douglas F Shearer picture Douglas F Shearer · Mar 17, 2011

Check out the aq branch, and rebase from master.

git checkout aq
git rebase master

Related questions

I ran into a merge conflict. How can I abort the merge?

I used git pull and had a merge conflict: unmerged: _widget.html.erb You are in the middle of a conflicted merge. I know that the other version of the file is good and that mine is bad so all …

Read More
Undo git pull, how to bring repos to old state

Is there any way to revert or undo git pull so that my source/repos will come to old state that was before doing git pull ? I want to do this because it merged some files which I didn't want …

Read More
When do you use Git rebase instead of Git merge?

When is it recommended to use Git rebase vs. Git merge? Do I still need to merge after a successful rebase?

Read More