eficode-academy/git-katas

Create kata to show rebase versus merge regarding conflicts

bicschneider opened this issue · 0 comments

Rebasing many commit can potentially generate many conflicts resolutions whereas a merge conmit only result in one batch of merge-conflicts