branch dev
dev1
master
master2
Create test2.java
Merge branch 'master' into dev