emmajane / gitforteams

95 stars 46 forks source link

We don't want to flatten out merges as they can contain insight into how... #11

Open adymitruk opened 9 years ago

adymitruk commented 9 years ago

... we solved a merge conflict.

This is also useful when rebasing with --onto.