git reports merge conflict with no changes, empty lines (using git-subtree)

Question

I\'m testing the use of git-subtree to merge a library repo into a bigger project. It seems great in principle. Sometimes when I do a \"git subtree pull\" I get merge conflicts

Answer 1

Use submodules to hold shared work. There is git-slave if you do a lot of work with shared and non-shared projects that need to be coordinated. Your line ending storage disparity will disappear.