Hi, On Wed, Mar 31, 2010 at 3:43 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > +such a case, you may want retry the command after recording the local > +changes (1) in a temporary commit on the current branch, or (2) by using > +"git stash". Alternatively, use "-m" option to force a merge. Couple of things: Is (1) really an option? The user will have to go through documentation on rewriting history, which I find completely unnecessary to just switch branches. Second, you might want to mention a "git stash apply" and include a reference to git-stash documentation. -- Ram -- 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