test add
- test no message

- commit a change without -m parameter
- commit useless

- commit a file which is used to test rm
- rm useless

- remove useless from stage
- add tag

- add tag: i am branch master
- i am branch1

- add tag file: ThisisBranch1
- a

- sdfsdf
- not master

- i am branch1
Merge branch 'branch1'

Conflicts:
	ThisisMaster

have been fixed