create dev branch master change1 create feature1 branch change master2 create feature2 branch merge --on-ff test change master