New file added
This is my first commit
Merge branch 'master' of github.com:ankurtripathi/git-demo
dasd
Merge remote-tracking branch 'origin/master'
Modification in new_git_file
text
Merge branch 'master' of github.com:ankurtripathi/git-demo
asdasd
Merge remote-tracking branch 'origin/master'
sadasd
Merge branch 'master' of github.com:ankurtripathi/git-demo
Merge remote-tracking branch 'origin/master'
Conflict example
Conflicting changes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	1.txt
sadsad
My changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	1.txt