diverging master
work on master after diverge
starting a branch for testing rebase conflicts
doing some work
more work on the branch
described how much the rebase with conflicts succeeded
an extra distancing commit
redoing the experiment
developing on master
developing again on master
small fix on master, and some more work
start of the experiment
some work on the experiment
more work
some more work