Comment Comment by 01walid Would you get the merge conflict if you mark the *.png extension as 'binary' in .gitattributes? parent 01walid 8 years ago
