On Fri, Mar 20, 2009 at 12:08:51AM -0700, Junio C Hamano wrote: > > First, commit your changes. Then merge the other developer's changes. :) > > We should probably point out to new people that "first commit and then > worry about merges after your changes are safely committed" is always how > people would "go about" anything. Yes, absolutely. Most of the current documentation focuses on being a reference to particular commands or tasks. But this is more of a "philosophy of working with git" item. I guess it should go in the user manual somewhere. Cc'ing Bruce, who may have some comments. -Peff -- 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