Rework merge rebase slides

[uekerman]

Description

The "rebase v.s merge" slides were always a little bit too fast. I added some intermediate pictures and slides.

Checklist

• [ ] I made sure that the markdown files are formatted properly.
• [ ] I made sure that all hyperlinks are working.