Conflicts in binary files - git
36360
Resolving a Git conflict with binary files
21620
How can I Remove .DS_Store files from a Git repository?
12943
How to discard local commits in Git?
36692
Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
3257
dpkg error: "trying to overwrite file, which is also in..."
63011
Git merge left HEAD marks in my files
53750
How to backup files in multiple directories with git?
110359
How to solve: -bash: : cannot execute binary file
14284
Mystery of binary files
125970
How to revert multiple git commits?
61412
Using latexdiff with git
112173
When would you use the different git merge strategies?
20954
Using git to manage /etc?
62799
How to use Git for Unity3D source control?
92403
How to ignore certain files in Git
19958
Modified files in a git branch are spilling over into another branch
6124
Git for beginners: The definitive practical guide