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 savannah repositories. I never had time to track it down. Anyway, thanks for the tutorial on how you use git. I'll give it a try. Can't be worse than what I'm doing now.
