init project-test
first commit
create 2.txt
first edit in 2.txt
create .gitignore and edit 2.txt first time
edit 2.txt second time
edit gitignore
edit 2.txt thried time
change .gitignore file
change .gitignore file to *.txt
change .gitignore to *.cc
add track again 2.txt
1.txt and 2.txt
this is gaibug branch changed 1.txt
this is master branch changed 1.txt
error
change 1.txt in master branch
change 1.txt in gaibug branch
merge gaibug branch
Merge remote-tracking branch 'github_origin/master'