.NET Handbook | Git / Merge vs Rebase