branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
dev add boy
Merge branch 'dev'
dev add girl
merge add boy and girl
fix bug 101
merged bug fix 101
finall test2
merged bug and dev
again to commit
111
222
333
git tracks changes
test finall finished