On Sun, Jun 18, 2006 at 09:43:00AM -0700, Ryan Anderson wrote:
>
> The fix is to drop the "-f" from git checkout, and things should work
> correctly. ("-f" should really not be a normal thing to use. For
> switching branches, "git checkout" should be sufficient, and should
> result ina working tree that doesn't contain nearly as many potential
> conflict sources.
I wrote all of that from memory, but I figured I should really test it:
$ git branch tmp v2.6.12
$ git checkout tmp
$ git pull . master
Updating from 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab to
553698f944ed715dfe023b4cef07601f0ce735f0
Checking files out...
100% (14284/14284) done
Fast forward
(Watch insanely large diffstat blow by)
$ git status
# On branch refs/heads/tmp
nothing to commit
$ git branch
master
origin
ryan
* tmp
So, I think all you need to do is drop the "-f" from the call to
checkout, and the issues will be fixed, for your particular use case.
--
Ryan Anderson
sometimes Pug Majere
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html