From: Jon Loeliger <jdl@jdl.com>
Date: Thu, 16 Feb 2006 14:32:37 GMT
Subject: Re: git faq : draft and rfc
Message-ID: <E1F9kBR-0005D0-7F@jdl.com>


> I'll try to add questions from the archives of this ml, I'm also open
> to any suggestions.

This is sort of the "missing" paragraph from the "git-checkout"
man page.  It's there now, but in the "-m" option.

jdl



Q.  Why won't git let me change to a different branch
    using "git checkout <branch>" or "git checkout -b <branch>"?
    Instead it just says:
        fatal: Entry 'foo.c' not uptodate. Cannot merge.

A.  You have changes to files in your working directory that
    will be overwritten, removed or otherwise lost if the checkout
    and change to the new branch were to proceed.  To fix this
    you may either check your changes in, create a patch of your
    changes and revert your files, or use the "-m" flag like this:
        git checkout -m -b my-branch