On 8/13/11, Leo Butler <l_butler at users.sourceforge.net> wrote:
> Barton Willis <willisb at unk.edu> writes:
>
>> The files src/share-subdirs.lisp and src/sharefiles.mk are both
>> automatically
>> generated (by configure), but doing a pull, git complains about these
>> files:
>>
>> Updating 0c6001a..c8d7c31
>> Aborting
>> error: Your local changes to the following files would be overwritten by
>> merge:
>> src/share-subdirs.lisp
>> src/sharefiles.mk
>> Please, commit your changes or stash them before you can merge.
>
> Barton,
> I don't think that you want to stash these changes.
>
> I generally use magit in emacs as a git front-end, and
> what I do is kill these changes. The corresponding
> git command is
>
> git --no-pager checkout -- <files>
>
> where <files> is the list of files to be reverted.
>
> Btw, it is probably best to do
>
> git pull --rebase
>
> rather than a simple git pull.
I dunno. How are casual users of Git (I believe this includes
most of the Maxima developers) supposed to know minutiae
like that? Rebase in particular is significantly different from
a simple pull; how shall we choose which one?
Git itself suggests stash, how do we know not to follow the
recommendation?
best,
Robert Dodier