Re: Git rescue mission

From: Bill Lear <rael@zopyra.com>
Date: Feb 8, 2007, 23:32 UTC
Message-ID: <17867.45813.15301.479436@lisa.zopyra.com>
In-Reply-To: <20070208232404.GA9493@coredump.intra.peff.net>

On Thursday, February 8, 2007 at 18:24:04 (-0500) Jeff King writes:

Show 10 quoted lines

>...
>Maybe I don't understand what you mean by sync here, but I don't see the
>mental leap. Whenever you fetch, from whatever branch, using the
>'origin' remote, it will update all tracking branches in your local
>repository. You can then selectively do merges to any local branches
>you're working on. You _can't_ do an operation that is "for every local
>branch I have, merge the matching remote branch into my local branch".
>And I don't think you'd want to: a merge may or may not be a trivial
>thing, since it might have conflicts.
>...

A very good point, and an obvious one in retrospect. I guess I will be entirely satisfied if I am on branch X I can just say 'git pull' and it will NOT pull from any other branch. You have added to my understanding on this, and thank you for taking the time.

Bill