git misery

[Pete Mack]

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?

[Nick]

Use linux

[Nick]

Seriously, no, I'm afraid - I haven't got a good Windows git client yet, but I haven't really been trying.

[d_m]

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?

[zaimoni]

If you have vim installed (like I do), use it to smash the line endings into the non-conflicted form.

[Derakon]

I believe the desired vim command is

:%s/^v^m//

Where ^v should be interpreted as "control + v" and ^m as "control + m".

At least, that's what I've used in the past when poking at the NPPAngband source, and I'm pretty certain that the NPP devs are using Windows.

[Pete Mack]

I understand all that, and I am using vim for that reason, but it's complaining about files I never even edited!
Grrr....
I never had problems like this with svn or even cvs

[d_m]

I understand all that, and I am using vim for that reason, but it's complaining about files I never even edited!
Grrr....
I never had problems like this with svn or even cvs

Maybe this will help?

http://help.github.com/dealing-with-lineendings/

[Pete Mack]

@d_m
That's better, but I am still getting errors.

What's the correct command for syncing with source?
Once I figure this stuff out, I'm going to blow away my entire tree, then start over.

[Nick]

If you're going to blow it all away anyway, I'd recommend making your own fork of angband/angband on github, then cloning that locally. takkaria has just updated the instructions for usehere - written in small words for people like me

[Pete Mack]

@Nick --
That's crazy. I just want to keep a local copy up to date.
What I am really looking for is the functionality to update the local copy, and overwrite any conflicting local changes.

svn update
svn revert <things that update complains about>
svn update

[Magnate]

@Nick --
That's crazy. I just want to keep a local copy up to date.
What I am really looking for is the functionality to update the local copy, and overwrite any conflicting local changes.

If you aren't going to maintain your own repo as Nick suggests, you can just "git clone git://github.com/angband/angband.git" to create a new local copy of the official upstream repo. Your "master" branch will automatically track origin/master.

To keep up to date, the commands are:

1. Git fetch origin

2. Git checkout master (if you're not there already)

3. Git merge origin/master

You shouldn't have to worry about overwriting conflicts, because you shouldn't be doing local changes in your master branch anyway. Just create a new branch for local changes and use merge or rebase to update it.

Similarly, you can create a staging branch to track the upstream staging branch if you want to help test that.

See also http://trac.rephial.org/wiki/GitUsage.