Go Back   Angband Forums > Angband > Development

Thread Tools Display Modes
Prev Previous Post   Next Post Next
Old February 6, 2011, 05:33   #1
Pete Mack
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,989
Donated: $40
Pete Mack is on a distinguished road
git misery

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 Mack is offline   Reply With Quote

Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
Moving to Git takkaria Development 57 December 4, 2010 10:22
Vanilla, Trac, Git, etc. takkaria Development 2 November 2, 2010 14:52
Bug in current vanilla, Git? Trac? Timo Pietilš Development 4 October 10, 2010 22:12
Sangband SVN/Git/? camlost Development 7 September 9, 2010 19:31
Threaded view misery Magnate Oook! 3 November 29, 2009 17:36

All times are GMT +1. The time now is 18:13.

Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2021, vBulletin Solutions Inc.