Thread: git misery
View Single Post
Old February 6, 2011, 05:47   #4
Angband Devteam member
d_m's Avatar
Join Date: Aug 2008
Location: Philadelphia, PA, USA
Age: 40
Posts: 1,516
d_m is on a distinguished road
Originally Posted by Pete Mack View Post
I just tried to pull the latest changes in angbandbase, and got conflict errors for every single file. It looks like a UNIX/WINDOWS EOL problem.
Any suggestions on how to fix it, with either the UI or the command line?
Pete, what editor on Windows are you using?

One thing to try is to use an editor which can save unix line endings, try saving the affected files with different line endings and see how that works.

Can you tell if the problem is that you have locally changed the endings on a bunch of lines, or if the remote source (i.e. Nick) has changed the endings on a bunch of lines?
d_m is offline   Reply With Quote