Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

LF Normalization #182

Closed
wants to merge 4 commits into
from

Conversation

Projects
None yet
3 participants
Contributor

CreepyGnome commented Jan 4, 2013

According to GitHub support the issue with the problems with the diffs being all red and all green is related to the LF normalization not being done. They state to address this issue we need to have a .gitattributes file that has the * text=auto and then check in the changes it makes.

Once the files are normalized future merges will look correct. I tested this in a branch and verified it does fix the issue. However in order for it to fix the pull request as well you would have to accept the changes which are normalizing the the LF and the addition of the .gitattributes file that forks will have to get as well to clean this up.

The other solution is that I only make changes to Massive and Massive.Sqlite and ignore Oracle and PostgreSQL.

I hope you accept this pull request which has a lot of green but its because it normalized the LF.

Rodney Foley and others added some commits Dec 18, 2012

Removed SQLite DLL dependency
Removed the unneeded using statement for System.Data.SQLite which
required a dependency on the 3rd party SQLite DLL.  This using wasn't
required to compile so no need to require the dependeny on a 3rd party
DLL.  Now the only dependency for all Massive files is .NET 4.0 or
higher.
Contributor

robconery commented Jan 8, 2013

Awesome! Thanks for the research here :). OK if you can do me the favor of "1 thing at a time" - meaning let's get the .gitattributes in place, then I can look through the other commits. As you can imagine - reconciling commits against issues that have nothing to do with the commits messes up a nice history.

So - I'll close this off, and would you mind do a pull req for the .gitattributes (so you get credit)? Then we can go from there.

@robconery robconery closed this Jan 8, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment