git misery

[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]

Originally Posted by 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.

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.