On Mon, Feb 16, 2009 at 8:48 AM, Andrew Ruder <andy@xxxxxxxxxxx> wrote: > > On Mon, Feb 16, 2009 at 9:13 AM, Brent Goodrick <bgoodr@xxxxxxxxx> wrote: > > 1. Move aside each file it complains about > > 2. Run the git-checkout command again > > 3. Move each file back to their original names, thus creating a local > > edit w.r.t. git > > Actually, on my git (1.6.0.4) this just magically works due to the > fact that 'git init' sets up the repository with HEAD pointing to > refs/heads/master (which doesn't exist yet) and you go ahead and > create the master branch with the 'git branch' command. > > In other words, in this particular situation the 'git checkout' > command is completely unnecessary and if you just run a 'git status' > you should already see that git sees all the differences already as > local edits (assuming you didn't call you branch in the 'git branch' > step something other than master). Well, it does show them as local edits, and actually shows the file as deleted. I ended up having to do a git-add on those files and commit them, which will work for me. bg -- 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
