Would you get the merge conflict if you mark the \*.png extension as 'binary' in...

		01walid on July 16, 2018 \| parent \| context \| favorite \| on: Image optimization decreased website's page weight... Would you get the merge conflict if you mark the *.png extension as 'binary' in .gitattributes?