git rebase and
git merge are used to synchronise changes between branches. The difference is
git rebase will revise the commits but keep a clean organised history, while
git merge will keep all the original commits and add ones automatically but gives out a circuit board like history.