From: Raimund Bauer Date: Thu, 14 Jun 2007 08:01:54 GMT Subject: Re: pull into dirty working tree Message-ID: <1181808114.6118.7.camel@localhost> In-Reply-To: <7vps3zascu.fsf@assigned-by-dhcp.pobox.com> On Thu, 2007-06-14 at 00:49 -0700, Junio C Hamano wrote: > Linus Torvalds writes: > > > It might make it a bit easier for CVS people to get used to the git model: > > keep your dirty working tree, and do "git pull" to update it, and fix up > > any conflicts in the working tree. That's how CVS works - it's a bad > > model, but it's a model that may be worth supporting just to get people > > more easily into the _good_ model. > > If a bad model _is_ supported, what incentive is there for these > people to move into the good model, I honestly wonder... Is it a bad model for the normal development process? Probably. Would it solve the problem of "I want to keep my debug-statements that I won't ever commit in the merged result"? ... yes I think that's at least one valid usecase we should probably support. One I'd also like to use ;-) -- best regards Ray