Implement parent branching. Track who a branch comes from and only allow merging...