Tell git to always select my local version or remote version for conflicted merges

.gitattributes

**/*.txt merge=theirs

.gitconfig

[merge "theirs"]
	driver = cat %B > %A
	name = simulate `-s theirs`

README.md

Tell git to always select my local version or remote version for conflicted merges

You need to run this command to include local .gitconfig file

git config --local include.path ../.gitconfig 

(http://stackoverflow.com/questions/18329621/storing-git-config-as-part-of-the-repository)

References

• http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-s/930495#930495
• https://gist.github.com/tmaybe/4c9d94712711229cd506