Git Merge and Fixing Mixed Spaces and Tabs with two Branches
By default git will see each difference in a line’s indentation as a change, so yes you’re likely to end up with mass conflicts doing a stock merge. However you can choose the merge strategy to use with the -s option: git merge -s recursive -Xignore-space-change This command would use the recursive strategy and uses …