master test branching
test branch
commit a file in testing branch
create some conflict
xxx
test rebase 1