mybranch commit
must be commited
add file bone.txt
add a line in test.txt
btwo commit
fix conflict
fix conflict in brwo
brone's first modification
brone's second modification
brone's third modification