In Git, there are two main ways to integrate changes from one branch into another: the merge and the rebase.

 

https://git-scm.com/book/en/v2/Git-Branching-Rebasing