Convert a two-parent commit into a single-parent one in git
- by Auron
Oops! It seems I did something wrong the last time I merged two branches in my repository:
This was far from what I was expecting. Is there a way to arrange this mess and obtain something like the following? What did I did wrong?