this is a readme file
add file{1..3}.txt
modified readme.txt
appened GPL
understand stage area works
git tracks changes
create a new branch called dev
feature: AND simple
master: & simple
fixed conflicts
create a new branch is quick and simple
(feature)
(master)
conflict fixed
add merge
merge with no-ff
add merge again
in branch dev
in branch feature1
in branch dev again