How to “pull” from a local branch into another one?

Question

This sounds so simple, but I just can\'t figure it out. I made an experimental branch a while ago, and now I\'d like to pull in all the changes that happened on master since I m

Answer 1

Quite old post, but it might help somebody new into git.

I will go with

git rebase master

• much cleaner log history and no merge commits (if done properly)
• need to deal with conflicts, but it's not that difficult.