Merging vs. Rebasing | Atlassian Git Tutorial