From: Tony Luck <tony.luck@gmail.com>
Date: Thu, 29 Sep 2005 17:52:10 GMT
Subject: Re: Pull from one branch to another?
Message-ID: <12c511ca0509291052108fa0a7@mail.gmail.com>
In-Reply-To: <433B84BD.8030003@pobox.com>

On 9/28/05, Jeff Garzik <jgarzik@pobox.com> wrote:

>         $ git checkout -f sky2
...
>         $ git checkout -f upstream
...
>         $ git checkout -f ALL

Those "-f" arguments to git checkout shouldn't be needed, and may
eventually cause a problem.  The "-f" option doesn't quite work as
"forcibly" as you might think it does because it ignores the index, and
so doesn't do what you[1] expect with files that exist in the previously
checked out tree, and not in the new tree ... it won't delete them, so
there's a small risk that with the wrong git operation you may
accidentally add them to the new branch.

In the sequence you described a simple "git checkout" should do the
right thing ... and will be faster too.

-Tony

[1] well what *I* expected, and was part of a snafu I made earlier