I believe the breaking change was normalizing the line endings - @bradh , you should just need to do a git pull --rebase and it will allow for the automatic merge again.