添加Hello word1
添加Hello word1
修改branch1.0
添加Main.java
branch1.0 添加55555
master 2 -> master
branch1.0 66666
branch1.0 77777
master 3 -> master
Merge branch 'branch1.0'

Conflicts:
	src/Main.java
rebase_test 111111-rebase_test
master 4 -> master

Conflicts:
	src/Main.java
add Main1.java -- master
Merge branch 'master' into rebase_test

Conflicts:
	src/Main.java
rebase_test 222222-rebase_test
rebase_test 3333333-rebase_test
Main1  1 -> master