Justin Donnaruma justindonnaruma
robert-claypool
/ ignore-line-endings
Last active
August 21, 2023 15:05
Ignore Line Endings with Git Merge
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git config merge.renormalize true # prevents unnecessary merge conflicts, http://stackoverflow.com/a/12194759/23566 |