On Mon, Nov 9, 2009 at 07:59, Dmitry Smirnov <divis1969@xxxxxxxxx> wrote: > Jacob Helwig <jacob.helwig <at> gmail.com> writes: > >> It does have a few caveats, however. If you have the same branch >> checked out in two different working copies created using >>... >> place on your machine, you'll never notice, thuogh. > > > So, i cannot recover from this situation by upmerging to the new head? > If you haven't actually made any changes in the second checkout of the branch, then recovery is a simple reset --hard. If you have made any changes in that working copy, then recovery is a bit more complicated, and it's probably best if I leave that explanation up to someone else, since I'm very careful to avoid this situation in the first place, and have never actually had to recover from it. -- 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