reset
Merge branch 'master' into feature1
Merge branch 'master' into feature1
feature1 is done
feature2 is done
Merge branch 'feature2'