test sandbox for learning git and discovering the joys and pitfalls of rebase and merge