[git] How do I move my branch from devel to master and return?

[drdanz]

Moving a branch from master to devel

It is easy to rebase a branch that you started on master on devel, since (assuming that master is fully merged into devel and that there are no conflicts) you can just run:

(branch)$ git pull --rebase origin devel

Moving a branch from devel to master

Rebasing a branch in the opposite direction is a bit trickier, since devel contains more commits that are not in master. There is an easy way to do it though (always assuming that there are no conflicts).

• First of all, update the repository and rebase your branch over latest devel

(branch)$ git fetch
(branch)$ git rebase origin/devel

• Then rebase using the --onto argument

(branch)$ git rebase --onto origin/master origin/devel