Per the readme, I've got autocrlf=true (I'm on Windows), however, I've finished some spiffy new work that I'm preparing for https://github.com/teamcfadvance/ValidateThis/pull/92, but a few files were replaced instead of merged, presumably due to EOL conversion issues.
Notice, for instance, how ValidateThis/unitTests/BOValidatorTest.cfc got replaced?
I'd like to know if this was a problem with the teamcfadvance/ValidateThis repo, or a problem on my end. If the latter, I could use some guidance on fixing it. (I'm still a Git noob, but I've learned a lot over the last week.)
Per the readme, I've got
autocrlf=true(I'm on Windows), however, I've finished some spiffy new work that I'm preparing for https://github.com/teamcfadvance/ValidateThis/pull/92, but a few files were replaced instead of merged, presumably due to EOL conversion issues.Here is the diff for the new working branch in question.
Notice, for instance, how
ValidateThis/unitTests/BOValidatorTest.cfcgot replaced?I'd like to know if this was a problem with the teamcfadvance/ValidateThis repo, or a problem on my end. If the latter, I could use some guidance on fixing it. (I'm still a Git noob, but I've learned a lot over the last week.)