On Wed, 15 Oct 2008, Andrew Morton wrote: > I do > > git-reset --hard HEAD > git-reset --hard linux-next > git-checkout linux-next > > and get > > error: Untracked working tree file 'Next/SHA1s' would be overwritten by merge. > y > > grr. What about simply: git-checkout -f linux-next Nicolas -- To unsubscribe from this list: 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
