How do you rebase the current branch's changes on top of changes being merged in?

Question

Okay. If I\'m on a branch (say working), and I want to merge in the changes from another branch (say master), then I run the command git-merg

Answer 1

Another way to look at it is to consider git rebase master as:

Rebase the current branch on top of master

Here , 'master' is the upstream branch, and that explain why, during a rebase, ours and theirs are reversed.