git — Rebase vs Merge - DEV Community