Testing rebasing/merging of branches