Due to files have different line-endings if they are edited on Linux or Windows there's often issues with merging. To resolved this we've added .gitattributes file that sets the default line ending on files. This makes Git automatically convert line endings for us. One issue is that if you have commits that are not yet in master you may have issues rebasing on master after this change. This is caused by files you've changed may have different line endings causing in a merge conflict. This is easily resolved though. Instead of doing a regular rebase run it with: git rebase -Xignore-space-at-eol upstream/master If that doesn't work try: git rebase -X renormalize upstream/master If neither of those works let me know and we'll figure out something!