Create kata to show rebase versus merge regarding conflicts

eficode-academy / git-katas

A set of exercises for deliberate Git Practice

MIT License

1.32k stars 860 forks source link

Open bicschneider opened 1 year ago

bicschneider commented 1 year ago

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