Junio C Hamano <gitster@xxxxxxxxx> writes: > There are two ways to deal with this situation, one safely, and another > quickly. And a third one : commit, and then rebase onto the other branch. It's safe, and nice when your local changes are ready to commit (then, you can write the commit message before bothering about potential merge conflicts). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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