Wrote code to do unsafe fast-forward merges.  Though it doesn't work yet.