Hacker News new | ask | show | jobs
by 01walid 2897 days ago
Would you get the merge conflict if you mark the *.png extension as 'binary' in .gitattributes?