Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I am new to GIT (from SVN). When I make a merge, all the file is set as conflicted (not only the lines where there is really a conflict).
This should come from a “end of line” problem between me (Windows) and my partner (Mac) but how to solve that?
man page for git-attributes
Set the proper attributes to tell Git to normalize line endings.