[sample file added by local dev branch]
Merge branch 'developer'
test message added to file3
file3 edited and commited from branch dev
merge conflict change
make some changes
 commited from centos git
variable file changed
variable file changed and merged conflict changed
commited from centos
Merge branch 'master' of https://github.com/leacoco/Hallo-World
centos file remove
some changes made to file3
merge conflict for file3 resolved
modify merge conflict
some test added to file from centos
Merge branch 'dev'
edit the file from windows
commit merge conflict file