master modify
b1 modify
15:46
b1 15:47
master 15:49
b1 15:49
master merge 15:49
b1 change
b1 change again
master change
master fix conflict change in squash

modify c2 after v1.0 change in squash
add hello in c2 amend
btw:hello add info when rebse and choose edit
add hellohello add rebase info
commit amend amend
master do
b1 do
Merge branch 'b1'
merge

Conflicts:
	c1.txt
	c2.txt
modify c8.txt
tes
add master in c1