Get git to not merge binary files but keep both?

Get git to not merge binary files but keep both?

References

Reference NO 1

http://stackoverflow.com/questions/13650871/get-git-to-not-merge-binary-files-but-keep-both

Reference NO 2

http://stackoverflow.com/questions/2089560/how-do-i-merge-a-binary-file

Reference NO 3

http://lostechies.com/joshuaflanagan/2010/01/29/how-to-resolve-a-binary-file-conflict-with-git/

Reference NO 4

http://www.gitguys.com/topics/merging-with-a-conflict-conflicts-and-resolutions/

Reference NO 5

http://git-annex.branchable.com/not/

Reference NO 6

http://git-scm.com/book/ch7-2.html

Reference NO 7

http://git-scm.com/docs/gitattributes

Reference NO 8

#EANF#