Git-merge
Git-merge is a git command which integrates changes from another branch by incorporating commits into the currently checked-out branch.
Git-rebase
With the git-rebase command, you can take the changes from one branch and replay them on top of another branch.
Others
| Example |
|---|
|
Git-rebase creates a tidier history while git-merge back and forth may create a complex commit graph in the end from question Is it OK to integrate changes into release branch? |