TIL that github used to merge files differently than git because it used its own merge implementation based on git's code, to make it work on bare repos. Showca

TIL that github used to merge files differently than git because it used its own merge implementation based on git's code, to make it work on bare repos. Showcases a benefit of open formats and open source, showcases a downside as well (I'd never guess it might merge differently.) It's a good thing nobody contributes to my github repos since noone had the chance to run into the issue...