initial commit
start tracking test.txt
first version
second version
third
third
1st
commits
initial commit
more changes
add master
first commit
commit1
2nd content commit
Merge branch 'master' of github.com:jadegitgit/part4.demo
3
resolved merge conflict
window2
2nd cotent commit
resovled merge conflict