add test.txt
add distributed
append GPL
understand how stage works
git tracks changes
add of files
branch test
test branch
And simple
& simple
conflict fixed
Add DEV1
add master
conflict1 fixed
add dev2
merge with no-ff
fix bug 101
merge bug fix 101
add dev123
conflict fixed