Git rebase vs merge khác nhau? Khi nào dùng gì?
VI- Merge: tạo merge commit, giữ history đầy đủ, safe cho shared branches.
- Rebase: rewrite history thành linear, clean hơn, KHÔNG dùng cho shared branches.
- Best practice: rebase feature branch lên develop trước khi merge (hoặc squash merge).
git rebase -i để clean commits.
- Merge: creates a merge commit, preserves full history, safe for shared branches.
- Rebase: rewrites history to be linear and cleaner — NEVER use on shared branches.
- Best practice: rebase your feature branch onto develop before merging (or use squash merge).
git rebase -i for cleaning up commits interactively.
Git