On Jan 11, 2008, at 12:16 PM, Bruno Haible wrote:
you will create a new repository. For this purpose, you can have a
"gnulib-clean" reposity that only ever contains unmodified gnulib;
copying
this repository (with "cp -a") is faster than doing a "gnulib
clone" across
the network.
You can
Paul Eggert wrote:
> > Then the two "git stash" commands were unnecessary; all that's needed is
> >
> > $ git pull
> > # fix conflicts then "git commit" of the merged files
>
> I vaguely recall that when I've done that in the past, I installed
> unnecessary gunk into the savannah rep
Bruno Haible <[EMAIL PROTECTED]> writes:
> Then the two "git stash" commands were unnecessary; all that's needed is
>
> $ git pull
> # fix conflicts then "git commit" of the merged files
I vaguely recall that when I've done that in the past, I installed
unnecessary gunk into the sav
Hi Paul,
> > $ git stash
> > $ git pull
> > $ git stash apply
> > # fix conflicts then "git commit" of the merged files
>
> Alas, the first step doesn't work; git says "No local changes to
> save".
Then the two "git stash" commands were unnecessary; all that's needed is
$ git pu
