3. Git Merge vs. Rebase

3.1. Merge

3.2. Rebase