Martin Waitz, Mon, May 21, 2007 01:12:01 +0200: > On Mon, May 21, 2007 at 01:02:48AM +0200, Alex Riesen wrote: > > > If the user did commit and then you do a supermodule checkout -m you > > > will get a merge. > > > > Only if the user continue to use the last branch (or the detached > > head) the subproject was on. He don't have to, he can even return to > > the commit which does not conflict, unless he have to complicate > > things. > > just curious: > so you want to differenciate between a subproject HEAD which was > set by the superproject and other ones? No. Why do you think that I want to do that? - 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
