This demo demonstrates the interesting bits of rebasing, i.e. what happens in the case of a conflict and how to abort. To do that, the demo:

• creates an initial repository with some commits;
• clones that repository;
• creates divergent commits in both repositories;
• shows aborting a rebase;
• shows a successful rebase with "conflict resolution" (in our case we just commit in the conflict marker chevrons).

I also noticed a minor bug in examples/remote.c so I fixed that, too.