rebase example.. advancing past server/client branches.